From 9ac8eee1a04d4cb185d3dcd75c3c8caa6f3758ea Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 9 Apr 2025 12:19:54 +0200 Subject: [PATCH] Removed duplicated and unused imports --- .../api_invoker_management/app.py | 9 ++- .../controllers/default_controller.py | 4 +- ...pi_invoker_enrolment_details_controller.py | 3 +- .../core/apiinvokerenrolmentdetails.py | 12 ++-- .../api_invoker_management/core/publisher.py | 1 + .../core/redis_event.py | 2 +- .../core/redis_internal_event.py | 2 +- .../core/validate_user.py | 6 +- .../api_invoker_management/models/__init__.py | 47 ------------- .../models/aef_location.py | 9 +-- .../models/aef_profile.py | 16 +---- .../models/api_invoker_enrolment_details.py | 13 ++-- .../api_invoker_enrolment_details_patch.py | 9 +-- .../api_invoker_management/models/api_list.py | 8 +-- .../models/api_status.py | 5 +- .../models/base_model.py | 1 - .../models/civic_address.py | 5 +- .../models/communication_type.py | 5 +- .../models/custom_operation.py | 9 +-- .../models/data_format.py | 5 +- .../models/ellipsoid_arc.py | 10 +-- .../models/gad_shape.py | 8 +-- .../models/geographic_area.py | 17 +---- .../models/geographical_coordinates.py | 5 +- .../models/interface_description.py | 12 ++-- .../models/invalid_param.py | 5 +- .../models/ip_addr_range.py | 9 +-- .../models/ipv4_address_range.py | 8 +-- .../models/ipv6_addr1.py | 5 +- .../models/ipv6_address_range.py | 8 +-- .../local2d_point_uncertainty_ellipse.py | 12 +--- .../local3d_point_uncertainty_ellipsoid.py | 12 +--- .../models/local_origin.py | 9 +-- .../models/o_auth_grant_type.py | 5 +- .../models/onboarding_information.py | 5 +- .../models/onboarding_notification.py | 9 +-- .../models/operation.py | 5 +- .../api_invoker_management/models/point.py | 10 +-- .../models/point_altitude.py | 10 +-- .../models/point_altitude_uncertainty.py | 11 +--- .../models/point_uncertainty_circle.py | 10 +-- .../models/point_uncertainty_ellipse.py | 11 +--- .../api_invoker_management/models/polygon.py | 10 +-- .../models/problem_details.py | 11 ++-- .../api_invoker_management/models/protocol.py | 5 +- .../models/published_api_path.py | 5 +- .../models/relative_cartesian_location.py | 5 +- .../api_invoker_management/models/resource.py | 10 +-- .../models/security_method.py | 5 +- .../models/service_api_description.py | 14 ++-- .../models/service_kpis.py | 8 +-- .../models/shareable_information.py | 5 +- .../models/supported_gad_shapes.py | 5 +- .../models/uncertainty_ellipse.py | 5 +- .../models/uncertainty_ellipsoid.py | 5 +- .../api_invoker_management/models/version.py | 9 +-- .../models/websock_notif_config.py | 5 +- .../api_invoker_management/test/__init__.py | 3 +- .../test/test_default_controller.py | 3 +- ...pi_invoker_enrolment_details_controller.py | 6 +- .../api_invoker_management/util.py | 1 + .../setup.py | 2 +- .../api_provider_management/app.py | 2 +- .../controllers/default_controller.py | 4 +- ...i_provider_enrolment_details_controller.py | 2 +- .../core/provider_enrolment_details_api.py | 9 ++- .../api_provider_management/core/publisher.py | 1 + .../core/redis_internal_event.py | 2 +- .../core/validate_user.py | 6 +- .../models/api_provider_enrolment_details.py | 11 ++-- .../api_provider_enrolment_details_patch.py | 8 +-- .../models/api_provider_func_role.py | 5 +- .../models/api_provider_function_details.py | 9 +-- .../models/base_model.py | 1 - .../models/invalid_param.py | 5 +- .../models/problem_details.py | 11 ++-- .../models/registration_information.py | 5 +- .../api_provider_management/test/__init__.py | 3 +- .../test/test_default_controller.py | 3 +- ...i_provider_enrolment_details_controller.py | 6 +- .../setup.py | 2 +- .../capif_acl/app.py | 9 ++- .../controllers/default_controller.py | 7 +- .../controllers/security_controller.py | 1 - .../capif_acl/core/accesscontrolpolicyapi.py | 2 +- .../capif_acl/models/__init__.py | 5 -- .../models/access_control_policy_list.py | 8 +-- .../capif_acl/models/api_invoker_policy.py | 8 +-- .../capif_acl/models/base_model.py | 1 - .../capif_acl/models/invalid_param.py | 5 +- .../capif_acl/models/problem_details.py | 11 ++-- .../capif_acl/models/time_range_list.py | 5 +- .../capif_acl/test/__init__.py | 3 +- .../setup.py | 2 +- .../TS29222_CAPIF_Auditing_API/logs/app.py | 7 +- .../logs/controllers/default_controller.py | 2 +- .../logs/core/auditoperations.py | 4 +- .../logs/encoder.py | 1 - .../logs/models/__init__.py | 11 ---- .../logs/models/base_model.py | 1 - .../logs/models/interface_description.py | 12 ++-- .../logs/models/invalid_param.py | 5 +- .../logs/models/invocation_log.py | 11 ++-- .../logs/models/invocation_logs.py | 11 ++-- .../models/invocation_logs_retrieve_res.py | 13 ++-- .../logs/models/log.py | 10 +-- .../logs/models/o_auth_grant_type.py | 5 +- .../logs/models/operation.py | 5 +- .../logs/models/problem_details.py | 11 ++-- .../logs/models/protocol.py | 5 +- .../logs/models/security_method.py | 5 +- .../logs/test/__init__.py | 1 - .../logs/test/test_default_controller.py | 2 - services/TS29222_CAPIF_Auditing_API/setup.py | 4 +- .../service_apis/app.py | 7 +- .../controllers/default_controller.py | 2 +- .../service_apis/core/discoveredapis.py | 5 +- .../service_apis/encoder.py | 1 - .../service_apis/models/__init__.py | 43 ------------ .../service_apis/models/aef_location.py | 9 +-- .../service_apis/models/aef_profile.py | 16 +---- .../service_apis/models/api_status.py | 5 +- .../service_apis/models/base_model.py | 1 - .../service_apis/models/civic_address.py | 5 +- .../service_apis/models/communication_type.py | 5 +- .../service_apis/models/custom_operation.py | 9 +-- .../service_apis/models/data_format.py | 5 +- .../service_apis/models/discovered_apis.py | 11 ++-- .../service_apis/models/ellipsoid_arc.py | 10 +-- .../service_apis/models/gad_shape.py | 8 +-- .../service_apis/models/geographic_area.py | 17 +---- .../models/geographical_coordinates.py | 5 +- .../models/interface_description.py | 12 ++-- .../service_apis/models/invalid_param.py | 5 +- .../service_apis/models/ip_addr_info.py | 5 +- .../service_apis/models/ip_addr_range.py | 9 +-- .../service_apis/models/ipv4_address_range.py | 8 +-- .../service_apis/models/ipv6_addr1.py | 5 +- .../service_apis/models/ipv6_address_range.py | 8 +-- .../local2d_point_uncertainty_ellipse.py | 12 +--- .../local3d_point_uncertainty_ellipsoid.py | 12 +--- .../service_apis/models/local_origin.py | 9 +-- .../service_apis/models/o_auth_grant_type.py | 5 +- .../service_apis/models/operation.py | 5 +- .../service_apis/models/point.py | 10 +-- .../service_apis/models/point_altitude.py | 10 +-- .../models/point_altitude_uncertainty.py | 11 +--- .../models/point_uncertainty_circle.py | 10 +-- .../models/point_uncertainty_ellipse.py | 11 +--- .../service_apis/models/polygon.py | 10 +-- .../service_apis/models/problem_details.py | 11 ++-- .../service_apis/models/protocol.py | 5 +- .../service_apis/models/published_api_path.py | 5 +- .../models/relative_cartesian_location.py | 5 +- .../service_apis/models/resource.py | 10 +-- .../service_apis/models/security_method.py | 5 +- .../models/service_api_description.py | 14 ++-- .../service_apis/models/service_kpis.py | 8 +-- .../models/shareable_information.py | 5 +- .../models/supported_gad_shapes.py | 5 +- .../models/uncertainty_ellipse.py | 5 +- .../models/uncertainty_ellipsoid.py | 5 +- .../service_apis/models/version.py | 9 +-- .../service_apis/test/__init__.py | 1 - .../test/test_default_controller.py | 2 - .../setup.py | 4 +- .../capif_events/app.py | 11 ++-- .../controllers/default_controller.py | 2 +- .../capif_events/core/events_apis.py | 7 +- .../capif_events/core/notifications.py | 1 - .../capif_events/core/validate_user.py | 6 +- .../capif_events/models/__init__.py | 66 ------------------- .../models/access_control_policy_list.py | 8 +-- .../models/access_control_policy_list_ext.py | 8 +-- .../capif_events/models/aef_location.py | 9 +-- .../capif_events/models/aef_profile.py | 16 +---- .../capif_events/models/api_invoker_policy.py | 8 +-- .../capif_events/models/api_status.py | 5 +- .../capif_events/models/base_model.py | 1 - .../models/buffered_notifications_action.py | 5 +- .../capif_events/models/capif_event.py | 5 +- .../capif_events/models/capif_event_detail.py | 11 +--- .../capif_events/models/capif_event_filter.py | 5 +- .../capif_events/models/civic_address.py | 5 +- .../capif_events/models/communication_type.py | 5 +- .../capif_events/models/custom_operation.py | 9 +-- .../capif_events/models/data_format.py | 5 +- .../capif_events/models/ellipsoid_arc.py | 10 +-- .../capif_events/models/event_notification.py | 9 +-- .../capif_events/models/event_subscription.py | 14 ++-- .../models/event_subscription_patch.py | 10 +-- .../capif_events/models/gad_shape.py | 8 +-- .../capif_events/models/geographic_area.py | 17 +---- .../models/geographical_coordinates.py | 5 +- .../models/interface_description.py | 12 ++-- .../capif_events/models/invalid_param.py | 5 +- .../capif_events/models/invocation_log.py | 11 ++-- .../capif_events/models/ip_addr_range.py | 9 +-- .../capif_events/models/ipv4_address_range.py | 8 +-- .../models/ipv4_address_range1.py | 8 +-- .../capif_events/models/ipv6_addr1.py | 5 +- .../capif_events/models/ipv6_address_range.py | 5 +- .../models/ipv6_address_range1.py | 8 +-- .../local2d_point_uncertainty_ellipse.py | 12 +--- .../local3d_point_uncertainty_ellipsoid.py | 12 +--- .../capif_events/models/local_origin.py | 9 +-- .../capif_events/models/log.py | 10 +-- .../models/muting_exception_instructions.py | 9 +-- .../models/muting_notifications_settings.py | 5 +- .../capif_events/models/notification_flag.py | 5 +- .../models/notification_method.py | 5 +- .../capif_events/models/o_auth_grant_type.py | 5 +- .../capif_events/models/operation.py | 5 +- .../models/partitioning_criteria.py | 5 +- .../capif_events/models/point.py | 10 +-- .../capif_events/models/point_altitude.py | 10 +-- .../models/point_altitude_uncertainty.py | 11 +--- .../models/point_uncertainty_circle.py | 10 +-- .../models/point_uncertainty_ellipse.py | 11 +--- .../capif_events/models/polygon.py | 10 +-- .../capif_events/models/problem_details.py | 11 ++-- .../capif_events/models/protocol.py | 5 +- .../capif_events/models/published_api_path.py | 5 +- .../models/relative_cartesian_location.py | 5 +- .../models/reporting_information.py | 12 +--- .../capif_events/models/resource.py | 10 +-- .../capif_events/models/routing_rule.py | 10 +-- .../capif_events/models/security_method.py | 5 +- .../models/service_api_description.py | 14 ++-- .../capif_events/models/service_kpis.py | 8 +-- .../models/shareable_information.py | 5 +- .../models/subscription_action.py | 5 +- .../models/supported_gad_shapes.py | 5 +- .../capif_events/models/time_range_list.py | 5 +- .../capif_events/models/topology_hiding.py | 8 +-- .../models/uncertainty_ellipse.py | 5 +- .../models/uncertainty_ellipsoid.py | 5 +- .../capif_events/models/version.py | 9 +-- .../models/websock_notif_config.py | 5 +- .../capif_events/test/__init__.py | 3 +- .../test/test_default_controller.py | 3 +- services/TS29222_CAPIF_Events_API/setup.py | 4 +- .../api_invocation_logs/app.py | 7 +- .../controllers/default_controller.py | 4 +- .../core/invocationlogs.py | 6 +- .../api_invocation_logs/core/redis_event.py | 2 +- .../api_invocation_logs/core/validate_user.py | 6 +- .../api_invocation_logs/models/__init__.py | 9 --- .../api_invocation_logs/models/base_model.py | 1 - .../models/interface_description.py | 12 ++-- .../models/invalid_param.py | 5 +- .../models/invocation_log.py | 11 ++-- .../api_invocation_logs/models/log.py | 10 +-- .../models/o_auth_grant_type.py | 5 +- .../api_invocation_logs/models/operation.py | 5 +- .../models/problem_details.py | 11 ++-- .../api_invocation_logs/models/protocol.py | 5 +- .../models/security_method.py | 5 +- .../api_invocation_logs/test/__init__.py | 3 +- .../test/test_default_controller.py | 3 +- .../setup.py | 4 +- .../published_apis/app.py | 11 ++-- .../controllers/default_controller.py | 4 +- ...individual_apf_published_api_controller.py | 2 +- .../controllers/security_controller.py | 1 - .../published_apis/core/publisher.py | 1 + .../published_apis/core/redis_event.py | 2 +- .../core/serviceapidescriptions.py | 16 +++-- .../published_apis/core/validate_user.py | 6 +- .../published_apis/encoder.py | 1 - .../published_apis/models/__init__.py | 42 ------------ .../published_apis/models/aef_location.py | 9 +-- .../published_apis/models/aef_profile.py | 16 +---- .../published_apis/models/api_status.py | 5 +- .../published_apis/models/base_model.py | 1 - .../published_apis/models/civic_address.py | 5 +- .../models/communication_type.py | 5 +- .../published_apis/models/custom_operation.py | 9 +-- .../published_apis/models/data_format.py | 5 +- .../published_apis/models/ellipsoid_arc.py | 10 +-- .../published_apis/models/gad_shape.py | 8 +-- .../published_apis/models/geographic_area.py | 17 +---- .../models/geographical_coordinates.py | 5 +- .../models/interface_description.py | 12 ++-- .../published_apis/models/invalid_param.py | 5 +- .../published_apis/models/ip_addr_range.py | 9 +-- .../models/ipv4_address_range.py | 8 +-- .../published_apis/models/ipv6_addr1.py | 5 +- .../models/ipv6_address_range.py | 8 +-- .../local2d_point_uncertainty_ellipse.py | 12 +--- .../local3d_point_uncertainty_ellipsoid.py | 12 +--- .../published_apis/models/local_origin.py | 9 +-- .../models/o_auth_grant_type.py | 5 +- .../published_apis/models/operation.py | 5 +- .../published_apis/models/point.py | 10 +-- .../published_apis/models/point_altitude.py | 10 +-- .../models/point_altitude_uncertainty.py | 11 +--- .../models/point_uncertainty_circle.py | 10 +-- .../models/point_uncertainty_ellipse.py | 11 +--- .../published_apis/models/polygon.py | 10 +-- .../published_apis/models/problem_details.py | 11 ++-- .../published_apis/models/protocol.py | 5 +- .../models/published_api_path.py | 5 +- .../models/relative_cartesian_location.py | 5 +- .../published_apis/models/resource.py | 10 +-- .../published_apis/models/security_method.py | 5 +- .../models/service_api_description.py | 14 ++-- .../models/service_api_description_patch.py | 14 ++-- .../published_apis/models/service_kpis.py | 8 +-- .../models/shareable_information.py | 5 +- .../models/supported_gad_shapes.py | 5 +- .../models/uncertainty_ellipse.py | 5 +- .../models/uncertainty_ellipsoid.py | 5 +- .../published_apis/models/version.py | 9 +-- .../published_apis/test/__init__.py | 1 - .../test/test_default_controller.py | 1 - ...individual_apf_published_api_controller.py | 1 - .../published_apis/util.py | 1 - .../published_apis/vendor_specific.py | 1 + .../setup.py | 4 +- .../capif_routing_info/app.py | 1 - .../controllers/default_controller.py | 5 -- .../controllers/security_controller.py | 1 - .../capif_routing_info/encoder.py | 4 +- .../capif_routing_info/models/__init__.py | 41 ------------ .../capif_routing_info/models/aef_location.py | 9 +-- .../capif_routing_info/models/aef_profile.py | 16 +---- .../capif_routing_info/models/base_model.py | 1 - .../models/civic_address.py | 5 +- .../models/communication_type.py | 5 +- .../models/custom_operation.py | 9 +-- .../capif_routing_info/models/data_format.py | 5 +- .../models/ellipsoid_arc.py | 10 +-- .../capif_routing_info/models/gad_shape.py | 8 +-- .../models/geographic_area.py | 17 +---- .../models/geographical_coordinates.py | 5 +- .../models/interface_description.py | 12 ++-- .../models/invalid_param.py | 5 +- .../models/ip_addr_range.py | 9 +-- .../models/ipv4_address_range.py | 8 +-- .../models/ipv4_address_range1.py | 8 +-- .../capif_routing_info/models/ipv6_addr1.py | 5 +- .../models/ipv6_address_range.py | 5 +- .../models/ipv6_address_range1.py | 8 +-- .../local2d_point_uncertainty_ellipse.py | 12 +--- .../local3d_point_uncertainty_ellipsoid.py | 12 +--- .../capif_routing_info/models/local_origin.py | 9 +-- .../models/o_auth_grant_type.py | 5 +- .../capif_routing_info/models/operation.py | 5 +- .../capif_routing_info/models/point.py | 10 +-- .../models/point_altitude.py | 10 +-- .../models/point_altitude_uncertainty.py | 11 +--- .../models/point_uncertainty_circle.py | 10 +-- .../models/point_uncertainty_ellipse.py | 11 +--- .../capif_routing_info/models/polygon.py | 10 +-- .../models/problem_details.py | 11 ++-- .../capif_routing_info/models/protocol.py | 5 +- .../models/relative_cartesian_location.py | 5 +- .../capif_routing_info/models/resource.py | 10 +-- .../capif_routing_info/models/routing_info.py | 8 +-- .../capif_routing_info/models/routing_rule.py | 10 +-- .../models/security_method.py | 5 +- .../capif_routing_info/models/service_kpis.py | 8 +-- .../models/supported_gad_shapes.py | 5 +- .../models/uncertainty_ellipse.py | 5 +- .../models/uncertainty_ellipsoid.py | 5 +- .../capif_routing_info/models/version.py | 9 +-- .../capif_routing_info/test/__init__.py | 3 +- .../test/test_default_controller.py | 2 - .../capif_routing_info/util.py | 1 - .../TS29222_CAPIF_Routing_Info_API/setup.py | 4 +- .../capif_security/app.py | 9 ++- .../controllers/default_controller.py | 2 +- .../capif_security/core/redis_event.py | 2 +- .../core/redis_internal_event.py | 2 +- .../capif_security/core/servicesecurity.py | 8 +-- .../capif_security/core/validate_user.py | 6 +- .../capif_security/models/__init__.py | 28 -------- .../models/access_token_claims.py | 8 +-- .../capif_security/models/access_token_err.py | 5 +- .../models/access_token_err1.py | 5 +- .../models/access_token_req1.py | 16 ++--- .../capif_security/models/access_token_rsp.py | 5 +- .../capif_security/models/base_model.py | 1 - .../capif_security/models/cause.py | 5 +- .../models/interface_description.py | 12 ++-- .../capif_security/models/invalid_param.py | 5 +- .../capif_security/models/invalid_param1.py | 5 +- .../models/ml_model_inter_ind.py | 8 +-- .../capif_security/models/nf_type.py | 5 +- .../models/no_profile_match_info.py | 9 +-- .../models/no_profile_match_reason.py | 5 +- .../capif_security/models/nwdaf_event.py | 5 +- .../models/o_auth_grant_type.py | 5 +- .../capif_security/models/plmn_id.py | 8 +-- .../capif_security/models/plmn_id_nid.py | 8 +-- .../capif_security/models/problem_details.py | 11 ++-- .../capif_security/models/problem_details1.py | 14 ++-- .../models/query_param_combination.py | 8 +-- .../capif_security/models/query_parameter.py | 5 +- .../capif_security/models/res_owner_id.py | 8 +-- .../models/security_information.py | 10 +-- .../capif_security/models/security_method.py | 5 +- .../models/security_notification.py | 8 +-- .../capif_security/models/service_security.py | 12 ++-- .../capif_security/models/snssai.py | 8 +-- .../models/websock_notif_config.py | 5 +- .../capif_security/test/__init__.py | 3 +- .../test/test_default_controller.py | 3 +- services/TS29222_CAPIF_Security_API/setup.py | 4 +- services/helper/helper_service/app.py | 8 +-- .../controllers/helper_controller.py | 2 +- .../helper_service/core/helper_operations.py | 11 +++- services/helper/helper_service/utils/utils.py | 2 + services/register/register_service/app.py | 7 +- .../controllers/register_controller.py | 2 +- .../core/register_operations.py | 4 +- .../register/register_service/utils/utils.py | 2 + 418 files changed, 984 insertions(+), 2130 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py index e44c08e4..abe58596 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py @@ -6,6 +6,9 @@ from datetime import datetime from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config +from core.consumer_messager import Subscriber from flask_apscheduler import APScheduler from flask_executor import Executor from flask_jwt_extended import JWTManager @@ -19,10 +22,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config -from core.consumer_messager import Subscriber - NAME = "Invoker-Service" # Setting log level @@ -36,7 +35,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Invoker-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py index 118e93fd..09ffb624 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py @@ -2,8 +2,8 @@ from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app -from flask_jwt_extended import jwt_required, get_jwt_identity +from flask import current_app, request +from flask_jwt_extended import get_jwt_identity, jwt_required from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations from ..core.validate_user import ControlAccess diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py index bdc1fd92..052679b4 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py @@ -1,4 +1,5 @@ -from api_invoker_management.models.api_invoker_enrolment_details_patch import APIInvokerEnrolmentDetailsPatch # noqa: E501 +from api_invoker_management.models.api_invoker_enrolment_details_patch import \ + APIInvokerEnrolmentDetailsPatch # noqa: E501 def modify_ind_api_invoke_enrolment(onboarding_id, body): # noqa: E501 diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py index 08f934e3..e3164aeb 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py @@ -5,21 +5,19 @@ from datetime import datetime import requests import rfc3987 +from api_invoker_management.db.db import MongoDatabse from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails -from flask import current_app, Response +from flask import Response, current_app from pymongo import ReturnDocument +from ..config import Config +from ..util import dict_to_camel_case, serialize_clean_camel_case from .auth_manager import AuthManager from .publisher import Publisher from .redis_event import RedisEvent from .redis_internal_event import RedisInternalEvent from .resources import Resource -from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response -from ..config import Config -from ..util import dict_to_camel_case, serialize_clean_camel_case - -from api_invoker_management.db.db import MongoDatabse - +from .responses import bad_request_error, forbidden_error, internal_server_error, make_response, not_found_error publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py index 34fcdf45..8292de4d 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py @@ -1,5 +1,6 @@ import redis + class Publisher(): def __init__(self): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_event.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_event.py index f80e6b2e..3037ae76 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_event.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import JSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_internal_event.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_internal_event.py index 50e34342..c1ad0973 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_internal_event.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/redis_internal_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import JSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py index 1b25fd6a..917c4ccb 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py @@ -1,12 +1,12 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import internal_server_error class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py index 274af8e6..d036df69 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py @@ -1,49 +1,2 @@ # flake8: noqa # import models into model package -from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails -from api_invoker_management.models.api_invoker_enrolment_details_patch import APIInvokerEnrolmentDetailsPatch -from api_invoker_management.models.api_list import APIList -from api_invoker_management.models.aef_location import AefLocation -from api_invoker_management.models.aef_profile import AefProfile -from api_invoker_management.models.api_status import ApiStatus -from api_invoker_management.models.civic_address import CivicAddress -from api_invoker_management.models.communication_type import CommunicationType -from api_invoker_management.models.custom_operation import CustomOperation -from api_invoker_management.models.data_format import DataFormat -from api_invoker_management.models.ellipsoid_arc import EllipsoidArc -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographic_area import GeographicArea -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.interface_description import InterfaceDescription -from api_invoker_management.models.invalid_param import InvalidParam -from api_invoker_management.models.ip_addr_range import IpAddrRange -from api_invoker_management.models.ipv4_address_range import Ipv4AddressRange -from api_invoker_management.models.ipv6_addr1 import Ipv6Addr1 -from api_invoker_management.models.ipv6_address_range import Ipv6AddressRange -from api_invoker_management.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse -from api_invoker_management.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid -from api_invoker_management.models.local_origin import LocalOrigin -from api_invoker_management.models.o_auth_grant_type import OAuthGrantType -from api_invoker_management.models.onboarding_information import OnboardingInformation -from api_invoker_management.models.onboarding_notification import OnboardingNotification -from api_invoker_management.models.operation import Operation -from api_invoker_management.models.point import Point -from api_invoker_management.models.point_altitude import PointAltitude -from api_invoker_management.models.point_altitude_uncertainty import PointAltitudeUncertainty -from api_invoker_management.models.point_uncertainty_circle import PointUncertaintyCircle -from api_invoker_management.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from api_invoker_management.models.polygon import Polygon -from api_invoker_management.models.problem_details import ProblemDetails -from api_invoker_management.models.protocol import Protocol -from api_invoker_management.models.published_api_path import PublishedApiPath -from api_invoker_management.models.relative_cartesian_location import RelativeCartesianLocation -from api_invoker_management.models.resource import Resource -from api_invoker_management.models.security_method import SecurityMethod -from api_invoker_management.models.service_api_description import ServiceAPIDescription -from api_invoker_management.models.service_kpis import ServiceKpis -from api_invoker_management.models.shareable_information import ShareableInformation -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipse import UncertaintyEllipse -from api_invoker_management.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from api_invoker_management.models.version import Version -from api_invoker_management.models.websock_notif_config import WebsockNotifConfig diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_location.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_location.py index 226cef2c..512c9804 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_location.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_location.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.civic_address import CivicAddress -from api_invoker_management.models.geographic_area import GeographicArea from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.civic_address import CivicAddress # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py index d650c30b..62866226 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py @@ -1,20 +1,9 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.aef_location import AefLocation -from api_invoker_management.models.data_format import DataFormat -from api_invoker_management.models.interface_description import InterfaceDescription -from api_invoker_management.models.ip_addr_range import IpAddrRange -from api_invoker_management.models.o_auth_grant_type import OAuthGrantType -from api_invoker_management.models.protocol import Protocol -from api_invoker_management.models.security_method import SecurityMethod -from api_invoker_management.models.service_kpis import ServiceKpis -from api_invoker_management.models.version import Version from api_invoker_management import util - from api_invoker_management.models.aef_location import AefLocation # noqa: E501 +from api_invoker_management.models.base_model import Model from api_invoker_management.models.data_format import DataFormat # noqa: E501 from api_invoker_management.models.interface_description import InterfaceDescription # noqa: E501 from api_invoker_management.models.ip_addr_range import IpAddrRange # noqa: E501 @@ -24,6 +13,7 @@ from api_invoker_management.models.security_method import SecurityMethod # noqa from api_invoker_management.models.service_kpis import ServiceKpis # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py index 521e6b2c..bec061ae 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py @@ -1,18 +1,13 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.api_list import APIList -from api_invoker_management.models.onboarding_information import OnboardingInformation -from api_invoker_management.models.websock_notif_config import WebsockNotifConfig -import re from api_invoker_management import util - from api_invoker_management.models.api_list import APIList # noqa: E501 +from api_invoker_management.models.base_model import Model from api_invoker_management.models.onboarding_information import OnboardingInformation # noqa: E501 from api_invoker_management.models.websock_notif_config import WebsockNotifConfig # noqa: E501 -import re # noqa: E501 + class APIInvokerEnrolmentDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details_patch.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details_patch.py index 0ac660c7..c827f22b 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details_patch.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details_patch.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.api_list import APIList -from api_invoker_management.models.onboarding_information import OnboardingInformation from api_invoker_management import util - from api_invoker_management.models.api_list import APIList # noqa: E501 +from api_invoker_management.models.base_model import Model from api_invoker_management.models.onboarding_information import OnboardingInformation # noqa: E501 + class APIInvokerEnrolmentDetailsPatch(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_list.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_list.py index 6054d75c..25ddd003 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_list.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_list.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.service_api_description import ServiceAPIDescription from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.service_api_description import ServiceAPIDescription # noqa: E501 + class APIList(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_status.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_status.py index c67e0f6c..7bf0540b 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_status.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_status.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class ApiStatus(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model.py index 9975e6c9..19dfa2af 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from api_invoker_management import util diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/civic_address.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/civic_address.py index a70b83c3..640aff79 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/civic_address.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/civic_address.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class CivicAddress(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py index a09339c5..0f199361 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class CommunicationType(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py index c39874de..0fc56782 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.communication_type import CommunicationType -from api_invoker_management.models.operation import Operation from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.communication_type import CommunicationType # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/data_format.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py index 3b5ef198..f6ba60af 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class DataFormat(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ellipsoid_arc.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ellipsoid_arc.py index 48576865..de005059 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ellipsoid_arc.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ellipsoid_arc.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/gad_shape.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/gad_shape.py index fdbb7ff5..496c79b9 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/gad_shape.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/gad_shape.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/geographic_area.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographic_area.py index 11758707..2ec1f553 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographic_area.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographic_area.py @@ -1,20 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.ellipsoid_arc import EllipsoidArc -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.point import Point -from api_invoker_management.models.point_altitude import PointAltitude -from api_invoker_management.models.point_altitude_uncertainty import PointAltitudeUncertainty -from api_invoker_management.models.point_uncertainty_circle import PointUncertaintyCircle -from api_invoker_management.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from api_invoker_management.models.polygon import Polygon -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipse import UncertaintyEllipse from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.ellipsoid_arc import EllipsoidArc # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.models.point import Point # noqa: E501 @@ -26,6 +14,7 @@ from api_invoker_management.models.polygon import Polygon # noqa: E501 from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/geographical_coordinates.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographical_coordinates.py index 1e82fce5..8c660935 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographical_coordinates.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/geographical_coordinates.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class GeographicalCoordinates(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py index 86301d32..3a9d6f55 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.o_auth_grant_type import OAuthGrantType -from api_invoker_management.models.security_method import SecurityMethod -import re from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from api_invoker_management.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). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py index 9fd06e46..20270842 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ip_addr_range.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ip_addr_range.py index f831d595..70ad8a6f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ip_addr_range.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ip_addr_range.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.ipv4_address_range import Ipv4AddressRange -from api_invoker_management.models.ipv6_address_range import Ipv6AddressRange from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 from api_invoker_management.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 + class IpAddrRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv4_address_range.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv4_address_range.py index bddd1688..822aaa85 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv4_address_range.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -import re from api_invoker_management import util +from api_invoker_management.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_addr1.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_addr1.py index ac8e6e66..0d7d43f4 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_addr1.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_addr1.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class Ipv6Addr1(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_address_range.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_address_range.py index 0b461670..9dc04924 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_address_range.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/ipv6_address_range.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.ipv6_addr1 import Ipv6Addr1 from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.ipv6_addr1 import Ipv6Addr1 # noqa: E501 + class Ipv6AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local2d_point_uncertainty_ellipse.py index b68d5903..5e05b820 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local2d_point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local2d_point_uncertainty_ellipse.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.local_origin import LocalOrigin -from api_invoker_management.models.relative_cartesian_location import RelativeCartesianLocation -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipse import UncertaintyEllipse from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.local_origin import LocalOrigin # noqa: E501 from api_invoker_management.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py index 1ea64800..22c894f2 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.local_origin import LocalOrigin -from api_invoker_management.models.relative_cartesian_location import RelativeCartesianLocation -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipsoid import UncertaintyEllipsoid from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.local_origin import LocalOrigin # noqa: E501 from api_invoker_management.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/local_origin.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local_origin.py index 1f5eb93a..489ceef8 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local_origin.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/local_origin.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.geographic_area import GeographicArea -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.geographic_area import GeographicArea # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/o_auth_grant_type.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/o_auth_grant_type.py index 3bc3a6f8..a688eb0c 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py index 8b5f6ea8..2ab7410e 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class OnboardingInformation(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py index 95d256ae..c60d37ee 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py @@ -1,14 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails -from api_invoker_management.models.api_list import APIList from api_invoker_management import util - from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501 from api_invoker_management.models.api_list import APIList # noqa: E501 +from api_invoker_management.models.base_model import Model + class OnboardingNotification(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py index 846011b5..330be5f0 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point.py index 82fa8c78..b9f091ae 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/point_altitude.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude.py index 514bfe78..f4e1481d 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude_uncertainty.py index 71170148..5f5449dd 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude_uncertainty.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_altitude_uncertainty.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipse import UncertaintyEllipse from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_circle.py index 2b28dd8f..deb1f0a0 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_circle.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_circle.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_ellipse.py index 09c55edb..ad7cc40d 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/point_uncertainty_ellipse.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes -from api_invoker_management.models.uncertainty_ellipse import UncertaintyEllipse from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/polygon.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/polygon.py index 4b939caf..0999dd1b 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/polygon.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/polygon.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.gad_shape import GADShape -from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates -from api_invoker_management.models.supported_gad_shapes import SupportedGADShapes from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.gad_shape import GADShape # noqa: E501 from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/problem_details.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py index 420db0c1..f4405ce2 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.invalid_param import InvalidParam -import re from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py index efdaa084..9fefc9c7 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py index 64da80c7..158dca12 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class PublishedApiPath(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/relative_cartesian_location.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/relative_cartesian_location.py index 5bdb56a9..82963b5f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/relative_cartesian_location.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/relative_cartesian_location.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class RelativeCartesianLocation(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py index b9b047b0..e30732ae 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.communication_type import CommunicationType -from api_invoker_management.models.custom_operation import CustomOperation -from api_invoker_management.models.operation import Operation from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.communication_type import CommunicationType # noqa: E501 from api_invoker_management.models.custom_operation import CustomOperation # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/security_method.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py index 0a9e7394..a5937300 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py index 17106920..1b38bd50 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.aef_profile import AefProfile -from api_invoker_management.models.api_status import ApiStatus -from api_invoker_management.models.published_api_path import PublishedApiPath -from api_invoker_management.models.shareable_information import ShareableInformation -import re from api_invoker_management import util - from api_invoker_management.models.aef_profile import AefProfile # noqa: E501 from api_invoker_management.models.api_status import ApiStatus # noqa: E501 +from api_invoker_management.models.base_model import Model from api_invoker_management.models.published_api_path import PublishedApiPath # noqa: E501 from api_invoker_management.models.shareable_information import ShareableInformation # noqa: E501 -import re # noqa: E501 + class ServiceAPIDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_kpis.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_kpis.py index e17f70fe..9314fcd6 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_kpis.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_kpis.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -import re from api_invoker_management import util +from api_invoker_management.models.base_model import Model -import re # noqa: E501 class ServiceKpis(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py index e4f8263e..7e73226d 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class ShareableInformation(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/supported_gad_shapes.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/supported_gad_shapes.py index 5a361e90..1242387f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/supported_gad_shapes.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/supported_gad_shapes.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class SupportedGADShapes(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipse.py index 6db89075..b5a594eb 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipse.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class UncertaintyEllipse(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipsoid.py index 613c6cc8..496846f8 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/uncertainty_ellipsoid.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class UncertaintyEllipsoid(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py index 46329299..9570e89f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model -from api_invoker_management.models.custom_operation import CustomOperation -from api_invoker_management.models.resource import Resource from api_invoker_management import util - +from api_invoker_management.models.base_model import Model from api_invoker_management.models.custom_operation import CustomOperation # noqa: E501 from api_invoker_management.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_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py index 4d3f5d7d..1a300a31 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invoker_management.models.base_model import Model from api_invoker_management import util +from api_invoker_management.models.base_model import Model class WebsockNotifConfig(Model): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/__init__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/__init__.py index 6f062ad6..df1dcccb 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/__init__.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from api_invoker_management.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_default_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_default_controller.py index a74ac675..0c5bab82 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_default_controller.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_default_controller.py @@ -1,10 +1,9 @@ import unittest -from flask import json - from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501 from api_invoker_management.models.problem_details import ProblemDetails # noqa: E501 from api_invoker_management.test import BaseTestCase +from flask import json class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_individual_api_invoker_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_individual_api_invoker_enrolment_details_controller.py index 598c8812..1506dfbb 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_individual_api_invoker_enrolment_details_controller.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/test/test_individual_api_invoker_enrolment_details_controller.py @@ -1,11 +1,11 @@ import unittest -from flask import json - from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501 -from api_invoker_management.models.api_invoker_enrolment_details_patch import APIInvokerEnrolmentDetailsPatch # noqa: E501 +from api_invoker_management.models.api_invoker_enrolment_details_patch import \ + APIInvokerEnrolmentDetailsPatch # noqa: E501 from api_invoker_management.models.problem_details import ProblemDetails # noqa: E501 from api_invoker_management.test import BaseTestCase +from flask import json class TestIndividualAPIInvokerEnrolmentDetailsController(BaseTestCase): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py index c54beede..cf911e58 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py @@ -2,6 +2,7 @@ import datetime from api_invoker_management import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py b/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py index 7187d5c1..c41926d4 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup NAME = "api_invoker_management" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py index 0838c6b7..c4b33c57 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/app.py @@ -32,7 +32,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Provider-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py index 6232ea29..0a67ace6 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py @@ -3,8 +3,8 @@ from functools import wraps from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app -from flask_jwt_extended import jwt_required, get_jwt_identity +from flask import current_app, request +from flask_jwt_extended import get_jwt_identity, jwt_required from ..core.provider_enrolment_details_api import ProviderManagementOperations from ..core.validate_user import ControlAccess diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py index abc75937..cefef1ef 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py @@ -1,4 +1,4 @@ -from flask import request, current_app +from flask import current_app, request from ..core.provider_enrolment_details_api import ProviderManagementOperations from ..models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch # noqa: E501 diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py index a721a5aa..60b89b14 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py @@ -4,16 +4,15 @@ import secrets from datetime import datetime from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 -from flask import current_app, Response +from flask import Response, current_app from pymongo import ReturnDocument +from ..core.sign_certificate import sign_certificate +from ..util import clean_empty, dict_to_camel_case, serialize_clean_camel_case from .auth_manager import AuthManager from .redis_internal_event import RedisInternalEvent from .resources import Resource -from .responses import internal_server_error, not_found_error, forbidden_error, make_response, bad_request_error -from ..core.sign_certificate import sign_certificate -from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case - +from .responses import bad_request_error, forbidden_error, internal_server_error, make_response, not_found_error TOTAL_FEATURES = 2 SUPPORTED_FEATURES_HEX = "0" diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py index acedb7e3..9f503516 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py @@ -1,5 +1,6 @@ import redis + class Publisher(): def __init__(self): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/redis_internal_event.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/redis_internal_event.py index 50e34342..c1ad0973 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/redis_internal_event.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/redis_internal_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import JSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py index 153a90c7..fea52c11 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py @@ -1,12 +1,12 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import internal_server_error class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py index da7fb6da..18f2a1e6 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model -from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails -import re from api_provider_management import util - from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails # noqa: E501 -import re # noqa: E501 +from api_provider_management.models.base_model import Model + class APIProviderEnrolmentDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py index e16230b9..5f4ab09b 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py @@ -1,12 +1,10 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model -from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails from api_provider_management import util - from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails # noqa: E501 +from api_provider_management.models.base_model import Model + class APIProviderEnrolmentDetailsPatch(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py index 7f3bb0f7..78d95461 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model from api_provider_management import util +from api_provider_management.models.base_model import Model class ApiProviderFuncRole(Model): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py index d6989b1a..1c5655bb 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model -from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole -from api_provider_management.models.registration_information import RegistrationInformation from api_provider_management import util - from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole # noqa: E501 +from api_provider_management.models.base_model import Model from api_provider_management.models.registration_information import RegistrationInformation # noqa: E501 + class APIProviderFunctionDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py index 4fd1d5c7..621b8c7d 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from api_provider_management import util diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py index 003aa181..cb682f81 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model from api_provider_management import util +from api_provider_management.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py index 7b4a267d..9d7f1232 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model -from api_provider_management.models.invalid_param import InvalidParam -import re from api_provider_management import util - +from api_provider_management.models.base_model import Model from api_provider_management.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py index 3e4d440c..737b0994 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_provider_management.models.base_model import Model from api_provider_management import util +from api_provider_management.models.base_model import Model class RegistrationInformation(Model): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py index 9853918d..7be5050e 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from api_provider_management.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py index 2b12ff85..120b96f8 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_default_controller.py @@ -1,10 +1,9 @@ import unittest -from flask import json - from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 from api_provider_management.models.problem_details import ProblemDetails # noqa: E501 from api_provider_management.test import BaseTestCase +from flask import json class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py index 463aa435..9c1819ac 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py @@ -1,11 +1,11 @@ import unittest -from flask import json - from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 -from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch # noqa: E501 +from api_provider_management.models.api_provider_enrolment_details_patch import \ + APIProviderEnrolmentDetailsPatch # noqa: E501 from api_provider_management.models.problem_details import ProblemDetails # noqa: E501 from api_provider_management.test import BaseTestCase +from flask import json class TestIndividualAPIProviderEnrolmentDetailsController(BaseTestCase): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/setup.py b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py index 0f5d4a62..406d0dae 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/setup.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup NAME = "api_provider_management" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py index 0b39d964..0841c2d2 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py @@ -6,6 +6,9 @@ from datetime import datetime from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config +from core.consumer_messager import Subscriber from flask_apscheduler import APScheduler from flask_executor import Executor from flask_jwt_extended import JWTManager @@ -19,10 +22,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config -from core.consumer_messager import Subscriber - NAME = "Acl-Service" # Setting log level @@ -36,7 +35,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Acl-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py index 4cd2db2d..b24e6f00 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py @@ -2,20 +2,21 @@ from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app +from flask import current_app, request from ..core.accesscontrolpolicyapi import accessControlPolicyApi + def cert_validation(): def _cert_validation(f): @wraps(f) def __cert_validation(*args, **kwargs): - args = request.view_args + request.view_args cert_tmp = request.headers['X-Ssl-Client-Cert'] cert_raw = cert_tmp.replace('\t', '') - cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend()) + x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend()) result = f(**kwargs) diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/security_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/security_controller.py index 6d294ffd..8b137891 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/security_controller.py @@ -1,2 +1 @@ -from typing import List diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/accesscontrolpolicyapi.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/accesscontrolpolicyapi.py index 27e7f248..5c00ac43 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/accesscontrolpolicyapi.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/accesscontrolpolicyapi.py @@ -1,9 +1,9 @@ from flask import current_app -from .responses import make_response, not_found_error, internal_server_error from ..core.resources import Resource from ..models.access_control_policy_list import AccessControlPolicyList from ..util import serialize_clean_camel_case +from .responses import internal_server_error, make_response, not_found_error class accessControlPolicyApi(Resource): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/__init__.py index 43aa0151..d036df69 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/__init__.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/__init__.py @@ -1,7 +1,2 @@ # flake8: noqa # import models into model package -from capif_acl.models.access_control_policy_list import AccessControlPolicyList -from capif_acl.models.api_invoker_policy import ApiInvokerPolicy -from capif_acl.models.invalid_param import InvalidParam -from capif_acl.models.problem_details import ProblemDetails -from capif_acl.models.time_range_list import TimeRangeList diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/access_control_policy_list.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/access_control_policy_list.py index a851ac32..19dea5dc 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/access_control_policy_list.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/access_control_policy_list.py @@ -1,12 +1,10 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_acl.models.base_model import Model -from capif_acl.models.api_invoker_policy import ApiInvokerPolicy from capif_acl import util - from capif_acl.models.api_invoker_policy import ApiInvokerPolicy # noqa: E501 +from capif_acl.models.base_model import Model + class AccessControlPolicyList(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/api_invoker_policy.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/api_invoker_policy.py index a22e84c5..cdd35e29 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/api_invoker_policy.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/api_invoker_policy.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_acl.models.base_model import Model -from capif_acl.models.time_range_list import TimeRangeList from capif_acl import util - +from capif_acl.models.base_model import Model from capif_acl.models.time_range_list import TimeRangeList # noqa: E501 + class ApiInvokerPolicy(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/base_model.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/base_model.py index fed13c90..2e2e14aa 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/base_model.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from capif_acl import util diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/invalid_param.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/invalid_param.py index a6789dc2..b94db8da 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/invalid_param.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_acl.models.base_model import Model from capif_acl import util +from capif_acl.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/problem_details.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/problem_details.py index 8473fc2b..bf02e50e 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/problem_details.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_acl.models.base_model import Model -from capif_acl.models.invalid_param import InvalidParam -import re from capif_acl import util - +from capif_acl.models.base_model import Model from capif_acl.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/time_range_list.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/time_range_list.py index b9c47240..71f38cfc 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/time_range_list.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/models/time_range_list.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_acl.models.base_model import Model from capif_acl import util +from capif_acl.models.base_model import Model class TimeRangeList(Model): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/__init__.py index 5d664f82..f70a615e 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/__init__.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from capif_acl.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py index 043381ad..276b24f9 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup NAME = "capif_acl" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Auditing_API/logs/app.py b/services/TS29222_CAPIF_Auditing_API/logs/app.py index 4e8068e7..83fd706e 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/app.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/app.py @@ -5,6 +5,8 @@ import os from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter @@ -14,9 +16,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config - NAME = "Logs-Service" # Setting log level @@ -30,7 +29,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Logs-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py index 469bff22..0ff05f0d 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py @@ -1,4 +1,4 @@ -from flask import request, current_app +from flask import current_app, request from logs import util from logs.models.interface_description import InterfaceDescription # noqa: E501 from logs.models.operation import Operation # noqa: E501 diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py index 86586ed2..b4681ac0 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py @@ -3,10 +3,10 @@ import json from flask import current_app -from .resources import Resource -from .responses import bad_request_error, not_found_error, internal_server_error, make_response from ..models.invocation_log import InvocationLog from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import bad_request_error, internal_server_error, make_response, not_found_error class AuditOperations (Resource): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py index 3c674456..f9d89aae 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py @@ -1,5 +1,4 @@ from connexion.jsonifier import JSONEncoder - from logs.models.base_model import Model diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py index 316dfd92..d036df69 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py @@ -1,13 +1,2 @@ # flake8: noqa # import models into model package -from logs.models.interface_description import InterfaceDescription -from logs.models.invalid_param import InvalidParam -from logs.models.invocation_log import InvocationLog -from logs.models.invocation_logs import InvocationLogs -from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes -from logs.models.log import Log -from logs.models.o_auth_grant_type import OAuthGrantType -from logs.models.operation import Operation -from logs.models.problem_details import ProblemDetails -from logs.models.protocol import Protocol -from logs.models.security_method import SecurityMethod diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py index 56493bbf..16381a1d 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from logs import util diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py index b2302306..2a92e75c 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.o_auth_grant_type import OAuthGrantType -from logs.models.security_method import SecurityMethod -import re from logs import util - +from logs.models.base_model import Model from logs.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from logs.models.security_method import SecurityMethod # noqa: E501 -import re # noqa: E501 + class InterfaceDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py index 7da75a55..bafe0905 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model from logs import util +from logs.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py index 26d42ad5..bf5c2ee2 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.log import Log -import re from logs import util - +from logs.models.base_model import Model from logs.models.log import Log # noqa: E501 -import re # noqa: E501 + class InvocationLog(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py index f1ed39c0..55c37648 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.invocation_log import InvocationLog -import re from logs import util - +from logs.models.base_model import Model from logs.models.invocation_log import InvocationLog # noqa: E501 -import re # noqa: E501 + class InvocationLogs(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py index 4ebdec7c..07455f47 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py @@ -1,18 +1,13 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.invocation_log import InvocationLog -from logs.models.invocation_logs import InvocationLogs -from logs.models.log import Log -import re from logs import util - +from logs.models.base_model import Model from logs.models.invocation_log import InvocationLog # noqa: E501 from logs.models.invocation_logs import InvocationLogs # noqa: E501 from logs.models.log import Log # noqa: E501 -import re # noqa: E501 + class InvocationLogsRetrieveRes(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py index ef5604a6..a3c965ee 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/log.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.interface_description import InterfaceDescription -from logs.models.operation import Operation -from logs.models.protocol import Protocol from logs import util - +from logs.models.base_model import Model from logs.models.interface_description import InterfaceDescription # noqa: E501 from logs.models.operation import Operation # noqa: E501 from logs.models.protocol import Protocol # noqa: E501 + class Log(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py index 280b8ef7..57b4bf4e 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model from logs import util +from logs.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py index a8efafdc..cf35e30e 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model from logs import util +from logs.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py index 2a77eb97..c074f0e5 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model -from logs.models.invalid_param import InvalidParam -import re from logs import util - +from logs.models.base_model import Model from logs.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py index 989d9e4c..e2b23e6b 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model from logs import util +from logs.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py index b32bbf5b..9091c514 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from logs.models.base_model import Model from logs import util +from logs.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py index a3e8ced6..9209767d 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py @@ -2,7 +2,6 @@ import logging import connexion from flask_testing import TestCase - from logs.encoder import JSONEncoder diff --git a/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py index edeb6213..3e2153c6 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py @@ -1,7 +1,5 @@ import unittest -from flask import json - from logs.models.interface_description import InterfaceDescription # noqa: E501 from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes # noqa: E501 from logs.models.operation import Operation # noqa: E501 diff --git a/services/TS29222_CAPIF_Auditing_API/setup.py b/services/TS29222_CAPIF_Auditing_API/setup.py index 9e2a513e..cbd1ece8 100644 --- a/services/TS29222_CAPIF_Auditing_API/setup.py +++ b/services/TS29222_CAPIF_Auditing_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "logs" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py index 4084bfdb..f84d1844 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py @@ -5,6 +5,8 @@ import os from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config from flask_jwt_extended import JWTManager from fluent import sender from opentelemetry import trace @@ -16,9 +18,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config - NAME = "Discover-Service" # Setting log level @@ -32,7 +31,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Discover-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py index 694d6f4a..d1922947 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py @@ -1,6 +1,6 @@ import json -from flask import request, current_app +from flask import current_app, request from service_apis.models.discovered_apis import DiscoveredAPIs # noqa: E501 from ..core.discoveredapis import DiscoverApisOperations, return_negotiated_supp_feat_dict diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py index bdcd3004..394bad68 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py @@ -7,8 +7,11 @@ from ..core.resources import Resource from ..core.responses import internal_server_error, make_response, not_found_error from ..models.discovered_apis import DiscoveredAPIs from ..util import serialize_clean_camel_case -from ..vendor_specific import find_attribute_in_body, filter_apis_with_vendor_specific_params, \ +from ..vendor_specific import ( + filter_apis_with_vendor_specific_params, + find_attribute_in_body, remove_vendor_specific_fields +) TOTAL_FEATURES = 4 SUPPORTED_FEATURES_HEX = "2" diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py index c741e68b..26d33408 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py @@ -1,5 +1,4 @@ from connexion.jsonifier import JSONEncoder - from service_apis.models.base_model import Model diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py index 8451433a..d036df69 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py @@ -1,45 +1,2 @@ # flake8: noqa # import models into model package -from service_apis.models.aef_location import AefLocation -from service_apis.models.aef_profile import AefProfile -from service_apis.models.api_status import ApiStatus -from service_apis.models.civic_address import CivicAddress -from service_apis.models.communication_type import CommunicationType -from service_apis.models.custom_operation import CustomOperation -from service_apis.models.data_format import DataFormat -from service_apis.models.discovered_apis import DiscoveredAPIs -from service_apis.models.ellipsoid_arc import EllipsoidArc -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographic_area import GeographicArea -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.interface_description import InterfaceDescription -from service_apis.models.invalid_param import InvalidParam -from service_apis.models.ip_addr_info import IpAddrInfo -from service_apis.models.ip_addr_range import IpAddrRange -from service_apis.models.ipv4_address_range import Ipv4AddressRange -from service_apis.models.ipv6_addr1 import Ipv6Addr1 -from service_apis.models.ipv6_address_range import Ipv6AddressRange -from service_apis.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse -from service_apis.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid -from service_apis.models.local_origin import LocalOrigin -from service_apis.models.o_auth_grant_type import OAuthGrantType -from service_apis.models.operation import Operation -from service_apis.models.point import Point -from service_apis.models.point_altitude import PointAltitude -from service_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty -from service_apis.models.point_uncertainty_circle import PointUncertaintyCircle -from service_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from service_apis.models.polygon import Polygon -from service_apis.models.problem_details import ProblemDetails -from service_apis.models.protocol import Protocol -from service_apis.models.published_api_path import PublishedApiPath -from service_apis.models.relative_cartesian_location import RelativeCartesianLocation -from service_apis.models.resource import Resource -from service_apis.models.security_method import SecurityMethod -from service_apis.models.service_api_description import ServiceAPIDescription -from service_apis.models.service_kpis import ServiceKpis -from service_apis.models.shareable_information import ShareableInformation -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipse import UncertaintyEllipse -from service_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from service_apis.models.version import Version diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_location.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_location.py index 25fe56a3..bbceaa45 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_location.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_location.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.civic_address import CivicAddress -from service_apis.models.geographic_area import GeographicArea from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.civic_address import CivicAddress # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/aef_profile.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py index 78ff868a..11969441 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py @@ -1,20 +1,9 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.aef_location import AefLocation -from service_apis.models.data_format import DataFormat -from service_apis.models.interface_description import InterfaceDescription -from service_apis.models.ip_addr_range import IpAddrRange -from service_apis.models.o_auth_grant_type import OAuthGrantType -from service_apis.models.protocol import Protocol -from service_apis.models.security_method import SecurityMethod -from service_apis.models.service_kpis import ServiceKpis -from service_apis.models.version import Version from service_apis import util - from service_apis.models.aef_location import AefLocation # noqa: E501 +from service_apis.models.base_model import Model from service_apis.models.data_format import DataFormat # noqa: E501 from service_apis.models.interface_description import InterfaceDescription # noqa: E501 from service_apis.models.ip_addr_range import IpAddrRange # noqa: E501 @@ -24,6 +13,7 @@ from service_apis.models.security_method import SecurityMethod # noqa: E501 from service_apis.models.service_kpis import ServiceKpis # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/api_status.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/api_status.py index 81815062..eef94f95 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/api_status.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/api_status.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class ApiStatus(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model.py index 7951efc4..a083ea94 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from service_apis import util diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/civic_address.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/civic_address.py index 67c1a70f..7314bca7 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/civic_address.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/civic_address.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class CivicAddress(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py index 04b99a70..ea17cb87 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class CommunicationType(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py index b98c3dc9..fed2a347 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.communication_type import CommunicationType -from service_apis.models.operation import Operation from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.communication_type import CommunicationType # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/data_format.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py index 875a9539..7575f306 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class DataFormat(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py index 36a7889a..a2377563 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.service_api_description import ServiceAPIDescription -import re from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.service_api_description import ServiceAPIDescription # noqa: E501 -import re # noqa: E501 + class DiscoveredAPIs(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ellipsoid_arc.py index 9f6206bc..a5747b5e 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ellipsoid_arc.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ellipsoid_arc.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/gad_shape.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/gad_shape.py index 21e0ee19..dfc5dedb 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/gad_shape.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/gad_shape.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.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_Discover_Service_API/service_apis/models/geographic_area.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographic_area.py index dafc9960..3c2d44c2 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographic_area.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographic_area.py @@ -1,20 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.ellipsoid_arc import EllipsoidArc -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.point import Point -from service_apis.models.point_altitude import PointAltitude -from service_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty -from service_apis.models.point_uncertainty_circle import PointUncertaintyCircle -from service_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from service_apis.models.polygon import Polygon -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipse import UncertaintyEllipse from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.ellipsoid_arc import EllipsoidArc # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.models.point import Point # noqa: E501 @@ -26,6 +14,7 @@ from service_apis.models.polygon import Polygon # noqa: E501 from service_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/geographical_coordinates.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographical_coordinates.py index 4eae80d3..755e077a 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographical_coordinates.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/geographical_coordinates.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class GeographicalCoordinates(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py index da6cd574..7c44ba11 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.o_auth_grant_type import OAuthGrantType -from service_apis.models.security_method import SecurityMethod -import re from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from service_apis.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). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py index 67c79e30..74464bd1 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_info.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_info.py index 3cb739c6..1791b5a3 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_info.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_info.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class IpAddrInfo(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_range.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_range.py index 4b86f968..b95a30bd 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_range.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ip_addr_range.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.ipv4_address_range import Ipv4AddressRange -from service_apis.models.ipv6_address_range import Ipv6AddressRange from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 from service_apis.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 + class IpAddrRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv4_address_range.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv4_address_range.py index 9d500949..e2e91ad7 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv4_address_range.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -import re from service_apis import util +from service_apis.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_addr1.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_addr1.py index d8164b5f..7c01304e 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_addr1.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_addr1.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class Ipv6Addr1(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_address_range.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_address_range.py index e9fc81ec..b8e1c5e0 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_address_range.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/ipv6_address_range.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.ipv6_addr1 import Ipv6Addr1 from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.ipv6_addr1 import Ipv6Addr1 # noqa: E501 + class Ipv6AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local2d_point_uncertainty_ellipse.py index 23464399..105c1408 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local2d_point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local2d_point_uncertainty_ellipse.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.local_origin import LocalOrigin -from service_apis.models.relative_cartesian_location import RelativeCartesianLocation -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipse import UncertaintyEllipse from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.local_origin import LocalOrigin # noqa: E501 from service_apis.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from service_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local3d_point_uncertainty_ellipsoid.py index 4d9cb7bb..68e56109 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local3d_point_uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local3d_point_uncertainty_ellipsoid.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.local_origin import LocalOrigin -from service_apis.models.relative_cartesian_location import RelativeCartesianLocation -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.local_origin import LocalOrigin # noqa: E501 from service_apis.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from service_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/local_origin.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local_origin.py index bf20a6d3..880120dc 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local_origin.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/local_origin.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.geographic_area import GeographicArea -from service_apis.models.geographical_coordinates import GeographicalCoordinates from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.geographic_area import GeographicArea # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/o_auth_grant_type.py index fc93ba2e..b5020552 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py index 6e0b387e..a43fd60d 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point.py index a258d339..802b8a3d 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/point_altitude.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude.py index 3245960e..32b8233f 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude_uncertainty.py index aadbd510..9a70de0b 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude_uncertainty.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_altitude_uncertainty.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipse import UncertaintyEllipse from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_circle.py index 271b19bf..2870ddf9 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_circle.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_circle.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_ellipse.py index 7e7499cf..32f2ab66 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/point_uncertainty_ellipse.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes -from service_apis.models.uncertainty_ellipse import UncertaintyEllipse from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/polygon.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/polygon.py index 421b7c36..b3374e3f 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/polygon.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/polygon.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.gad_shape import GADShape -from service_apis.models.geographical_coordinates import GeographicalCoordinates -from service_apis.models.supported_gad_shapes import SupportedGADShapes from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.gad_shape import GADShape # noqa: E501 from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/problem_details.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py index f1e1241d..ac177318 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.invalid_param import InvalidParam -import re from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py index 6cc058a0..d88a4100 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py index a8210648..5736c473 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class PublishedApiPath(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/relative_cartesian_location.py index ee5b860a..f2f1a689 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/relative_cartesian_location.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/relative_cartesian_location.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class RelativeCartesianLocation(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py index f530875d..0f340dfe 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.communication_type import CommunicationType -from service_apis.models.custom_operation import CustomOperation -from service_apis.models.operation import Operation from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.communication_type import CommunicationType # noqa: E501 from service_apis.models.custom_operation import CustomOperation # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/models/security_method.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py index 3215ddaa..23372e62 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py index 743c1081..b81515a9 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.aef_profile import AefProfile -from service_apis.models.api_status import ApiStatus -from service_apis.models.published_api_path import PublishedApiPath -from service_apis.models.shareable_information import ShareableInformation -import re from service_apis import util - from service_apis.models.aef_profile import AefProfile # noqa: E501 from service_apis.models.api_status import ApiStatus # noqa: E501 +from service_apis.models.base_model import Model from service_apis.models.published_api_path import PublishedApiPath # noqa: E501 from service_apis.models.shareable_information import ShareableInformation # noqa: E501 -import re # noqa: E501 + class ServiceAPIDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_kpis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_kpis.py index de72ad5b..66dd9e35 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_kpis.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_kpis.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -import re from service_apis import util +from service_apis.models.base_model import Model -import re # noqa: E501 class ServiceKpis(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py index 8d21330b..0f0c7b02 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class ShareableInformation(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/supported_gad_shapes.py index 0f035470..d5e17a12 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/supported_gad_shapes.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/supported_gad_shapes.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class SupportedGADShapes(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipse.py index 03672693..53e6a3ad 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipse.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class UncertaintyEllipse(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipsoid.py index 6e598a1a..bac421f2 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/uncertainty_ellipsoid.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model from service_apis import util +from service_apis.models.base_model import Model class UncertaintyEllipsoid(Model): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py index e0a21cc0..7efbc3f7 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from service_apis.models.base_model import Model -from service_apis.models.custom_operation import CustomOperation -from service_apis.models.resource import Resource from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.custom_operation import CustomOperation # noqa: E501 from service_apis.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_Discover_Service_API/service_apis/test/__init__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/__init__.py index b0510f7c..8b9b70a8 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/__init__.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/__init__.py @@ -2,7 +2,6 @@ import logging import connexion from flask_testing import TestCase - from service_apis.encoder import JSONEncoder diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/test_default_controller.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/test_default_controller.py index 39959238..6e626023 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/test/test_default_controller.py @@ -1,7 +1,5 @@ import unittest -from flask import json - from service_apis.models.aef_location import AefLocation # noqa: E501 from service_apis.models.communication_type import CommunicationType # noqa: E501 from service_apis.models.data_format import DataFormat # noqa: E501 diff --git a/services/TS29222_CAPIF_Discover_Service_API/setup.py b/services/TS29222_CAPIF_Discover_Service_API/setup.py index 824ebbaa..da11c500 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/setup.py +++ b/services/TS29222_CAPIF_Discover_Service_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "service_apis" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Events_API/capif_events/app.py b/services/TS29222_CAPIF_Events_API/capif_events/app.py index ef1d8c3a..b9f0bd9b 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/app.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/app.py @@ -6,6 +6,10 @@ from datetime import datetime from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config +from core.consumer_messager import Subscriber +from core.notifications import Notifications from flask_apscheduler import APScheduler from flask_executor import Executor from flask_jwt_extended import JWTManager @@ -19,11 +23,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config -from core.consumer_messager import Subscriber -from core.notifications import Notifications - NAME = "Events-Service" # Setting log level @@ -37,7 +36,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Events-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py b/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py index 2e071c8b..f55aeb40 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py @@ -4,7 +4,7 @@ from capif_events.models.event_subscription import EventSubscription # noqa: E5 from capif_events.models.event_subscription_patch import EventSubscriptionPatch # noqa: E501 from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app +from flask import current_app, request from ..core.events_apis import EventSubscriptionsOperations from ..core.validate_user import ControlAccess diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py b/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py index 7f60bc24..440925c3 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py @@ -3,13 +3,12 @@ import secrets import rfc3987 from capif_events.models.event_subscription import EventSubscription # noqa: E501 -from flask import current_app, Response +from flask import Response, current_app +from ..util import clean_empty, dict_to_camel_case, serialize_clean_camel_case from .auth_manager import AuthManager from .resources import Resource -from .responses import internal_server_error, not_found_error, make_response, bad_request_error -from ..util import serialize_clean_camel_case, clean_empty, dict_to_camel_case - +from .responses import bad_request_error, internal_server_error, make_response, not_found_error TOTAL_FEATURES = 4 SUPPORTED_FEATURES_HEX = "c" diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py index 451054b3..9c8e07ff 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py @@ -8,7 +8,6 @@ import requests from encoder import CustomJSONEncoder from flask import current_app from models.event_notification import EventNotification -from models.event_subscription import EventSubscription from util import serialize_clean_camel_case from .internal_event_ops import InternalEventOperations diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py b/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py index 168e903f..2357408a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py @@ -1,12 +1,12 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import internal_server_error class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py index 537f7993..d036df69 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py @@ -1,68 +1,2 @@ # flake8: noqa # import models into model package -from capif_events.models.access_control_policy_list import AccessControlPolicyList -from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt -from capif_events.models.aef_location import AefLocation -from capif_events.models.aef_profile import AefProfile -from capif_events.models.api_invoker_policy import ApiInvokerPolicy -from capif_events.models.api_status import ApiStatus -from capif_events.models.buffered_notifications_action import BufferedNotificationsAction -from capif_events.models.capif_event import CAPIFEvent -from capif_events.models.capif_event_detail import CAPIFEventDetail -from capif_events.models.capif_event_filter import CAPIFEventFilter -from capif_events.models.civic_address import CivicAddress -from capif_events.models.communication_type import CommunicationType -from capif_events.models.custom_operation import CustomOperation -from capif_events.models.data_format import DataFormat -from capif_events.models.ellipsoid_arc import EllipsoidArc -from capif_events.models.event_notification import EventNotification -from capif_events.models.event_subscription import EventSubscription -from capif_events.models.event_subscription_patch import EventSubscriptionPatch -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographic_area import GeographicArea -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.interface_description import InterfaceDescription -from capif_events.models.invalid_param import InvalidParam -from capif_events.models.invocation_log import InvocationLog -from capif_events.models.ip_addr_range import IpAddrRange -from capif_events.models.ipv4_address_range import Ipv4AddressRange -from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1 -from capif_events.models.ipv6_addr1 import Ipv6Addr1 -from capif_events.models.ipv6_address_range import Ipv6AddressRange -from capif_events.models.ipv6_address_range1 import Ipv6AddressRange1 -from capif_events.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse -from capif_events.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid -from capif_events.models.local_origin import LocalOrigin -from capif_events.models.log import Log -from capif_events.models.muting_exception_instructions import MutingExceptionInstructions -from capif_events.models.muting_notifications_settings import MutingNotificationsSettings -from capif_events.models.notification_flag import NotificationFlag -from capif_events.models.notification_method import NotificationMethod -from capif_events.models.o_auth_grant_type import OAuthGrantType -from capif_events.models.operation import Operation -from capif_events.models.partitioning_criteria import PartitioningCriteria -from capif_events.models.point import Point -from capif_events.models.point_altitude import PointAltitude -from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty -from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle -from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from capif_events.models.polygon import Polygon -from capif_events.models.problem_details import ProblemDetails -from capif_events.models.protocol import Protocol -from capif_events.models.published_api_path import PublishedApiPath -from capif_events.models.relative_cartesian_location import RelativeCartesianLocation -from capif_events.models.reporting_information import ReportingInformation -from capif_events.models.resource import Resource -from capif_events.models.routing_rule import RoutingRule -from capif_events.models.security_method import SecurityMethod -from capif_events.models.service_api_description import ServiceAPIDescription -from capif_events.models.service_kpis import ServiceKpis -from capif_events.models.shareable_information import ShareableInformation -from capif_events.models.subscription_action import SubscriptionAction -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.time_range_list import TimeRangeList -from capif_events.models.topology_hiding import TopologyHiding -from capif_events.models.uncertainty_ellipse import UncertaintyEllipse -from capif_events.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from capif_events.models.version import Version -from capif_events.models.websock_notif_config import WebsockNotifConfig diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py index a64c3841..42b98fed 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py @@ -1,12 +1,10 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.api_invoker_policy import ApiInvokerPolicy from capif_events import util - from capif_events.models.api_invoker_policy import ApiInvokerPolicy # noqa: E501 +from capif_events.models.base_model import Model + class AccessControlPolicyList(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py index e99c495c..5cdc5543 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py @@ -1,12 +1,10 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.api_invoker_policy import ApiInvokerPolicy from capif_events import util - from capif_events.models.api_invoker_policy import ApiInvokerPolicy # noqa: E501 +from capif_events.models.base_model import Model + class AccessControlPolicyListExt(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py index 1f85dba5..5c51a242 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.civic_address import CivicAddress -from capif_events.models.geographic_area import GeographicArea from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.civic_address import CivicAddress # noqa: E501 from capif_events.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_Events_API/capif_events/models/aef_profile.py b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py index 02ae4b48..c29502c6 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py @@ -1,20 +1,9 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.aef_location import AefLocation -from capif_events.models.data_format import DataFormat -from capif_events.models.interface_description import InterfaceDescription -from capif_events.models.ip_addr_range import IpAddrRange -from capif_events.models.o_auth_grant_type import OAuthGrantType -from capif_events.models.protocol import Protocol -from capif_events.models.security_method import SecurityMethod -from capif_events.models.service_kpis import ServiceKpis -from capif_events.models.version import Version from capif_events import util - from capif_events.models.aef_location import AefLocation # noqa: E501 +from capif_events.models.base_model import Model from capif_events.models.data_format import DataFormat # noqa: E501 from capif_events.models.interface_description import InterfaceDescription # noqa: E501 from capif_events.models.ip_addr_range import IpAddrRange # noqa: E501 @@ -24,6 +13,7 @@ from capif_events.models.security_method import SecurityMethod # noqa: E501 from capif_events.models.service_kpis import ServiceKpis # noqa: E501 from capif_events.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_Events_API/capif_events/models/api_invoker_policy.py b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py index 4d2075bc..a627518b 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.time_range_list import TimeRangeList from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.time_range_list import TimeRangeList # noqa: E501 + class ApiInvokerPolicy(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py b/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py index 3ea72ce9..25b8d95c 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class ApiStatus(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py index 41797264..336bc44c 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from capif_events import util diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py b/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py index eca65477..b53e72cf 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class BufferedNotificationsAction(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py index fa3a9828..2d55c4ef 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class CAPIFEvent(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py index c15ad4c8..6dcc6c7f 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt -from capif_events.models.invocation_log import InvocationLog -from capif_events.models.service_api_description import ServiceAPIDescription -from capif_events.models.topology_hiding import TopologyHiding from capif_events import util - from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt # noqa: E501 +from capif_events.models.base_model import Model from capif_events.models.invocation_log import InvocationLog # noqa: E501 from capif_events.models.service_api_description import ServiceAPIDescription # noqa: E501 from capif_events.models.topology_hiding import TopologyHiding # noqa: E501 + class CAPIFEventDetail(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py index e9c1638d..dd7c2d7c 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class CAPIFEventFilter(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py b/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py index 5819d5f2..379ebe0a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class CivicAddress(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py index e5203eb6..3beb1ab1 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class CommunicationType(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py index 5676f216..4b20ff1e 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.communication_type import CommunicationType -from capif_events.models.operation import Operation from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.communication_type import CommunicationType # noqa: E501 from capif_events.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_Events_API/capif_events/models/data_format.py b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py index adec690a..c668244c 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class DataFormat(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py index b5be85b2..928435e9 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.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_Events_API/capif_events/models/event_notification.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py index 9200e1bc..a77a357e 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.capif_event import CAPIFEvent -from capif_events.models.capif_event_detail import CAPIFEventDetail from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.capif_event import CAPIFEvent # noqa: E501 from capif_events.models.capif_event_detail import CAPIFEventDetail # noqa: E501 + class EventNotification(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py index ee0aafea..0470f4e6 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.capif_event import CAPIFEvent -from capif_events.models.capif_event_filter import CAPIFEventFilter -from capif_events.models.reporting_information import ReportingInformation -from capif_events.models.websock_notif_config import WebsockNotifConfig -import re from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.capif_event import CAPIFEvent # noqa: E501 from capif_events.models.capif_event_filter import CAPIFEventFilter # noqa: E501 from capif_events.models.reporting_information import ReportingInformation # noqa: E501 from capif_events.models.websock_notif_config import WebsockNotifConfig # noqa: E501 -import re # noqa: E501 + class EventSubscription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py index 51be7cd3..437e372d 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.capif_event import CAPIFEvent -from capif_events.models.capif_event_filter import CAPIFEventFilter -from capif_events.models.reporting_information import ReportingInformation from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.capif_event import CAPIFEvent # noqa: E501 from capif_events.models.capif_event_filter import CAPIFEventFilter # noqa: E501 from capif_events.models.reporting_information import ReportingInformation # noqa: E501 + class EventSubscriptionPatch(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py b/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py index f669a853..4ff103eb 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.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_Events_API/capif_events/models/geographic_area.py b/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py index 45c7018d..f09f9422 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py @@ -1,20 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.ellipsoid_arc import EllipsoidArc -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.point import Point -from capif_events.models.point_altitude import PointAltitude -from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty -from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle -from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from capif_events.models.polygon import Polygon -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.uncertainty_ellipse import UncertaintyEllipse from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.ellipsoid_arc import EllipsoidArc # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.models.point import Point # noqa: E501 @@ -26,6 +14,7 @@ from capif_events.models.polygon import Polygon # noqa: E501 from capif_events.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_events.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_Events_API/capif_events/models/geographical_coordinates.py b/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py index 38210506..c0cc15c6 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class GeographicalCoordinates(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py index e31b30d2..69bf2441 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.o_auth_grant_type import OAuthGrantType -from capif_events.models.security_method import SecurityMethod -import re from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from capif_events.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). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py index 9f3557f5..ce023bf2 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py index b67a3978..450c08bb 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.log import Log -import re from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.log import Log # noqa: E501 -import re # noqa: E501 + class InvocationLog(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py index f633723b..0c43c0a4 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.ipv4_address_range import Ipv4AddressRange -from capif_events.models.ipv6_address_range1 import Ipv6AddressRange1 from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 from capif_events.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_Events_API/capif_events/models/ipv4_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py index 10e51773..2f1dc1f9 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -import re from capif_events import util +from capif_events.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py index c0291053..8c0d6664 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -import re from capif_events import util +from capif_events.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange1(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py index d07d4876..0dd4716a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class Ipv6Addr1(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py index 17f20cdd..b7a59aff 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class Ipv6AddressRange(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py index 4d678058..1f992719 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.ipv6_addr1 import Ipv6Addr1 from capif_events import util - +from capif_events.models.base_model import Model from capif_events.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_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py index 694b07d0..3432c476 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.local_origin import LocalOrigin -from capif_events.models.relative_cartesian_location import RelativeCartesianLocation -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.uncertainty_ellipse import UncertaintyEllipse from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.local_origin import LocalOrigin # noqa: E501 from capif_events.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from capif_events.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_events.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_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py index 7f164c4d..702a38e1 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.local_origin import LocalOrigin -from capif_events.models.relative_cartesian_location import RelativeCartesianLocation -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.uncertainty_ellipsoid import UncertaintyEllipsoid from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.local_origin import LocalOrigin # noqa: E501 from capif_events.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from capif_events.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_events.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_Events_API/capif_events/models/local_origin.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py index f5b69773..f11e9ffe 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.geographic_area import GeographicArea -from capif_events.models.geographical_coordinates import GeographicalCoordinates from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.geographic_area import GeographicArea # noqa: E501 from capif_events.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_Events_API/capif_events/models/log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py index bfb21f73..647a3c08 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/log.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.interface_description import InterfaceDescription -from capif_events.models.operation import Operation -from capif_events.models.protocol import Protocol from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.interface_description import InterfaceDescription # noqa: E501 from capif_events.models.operation import Operation # noqa: E501 from capif_events.models.protocol import Protocol # noqa: E501 + class Log(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py index 00839244..a928f40f 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.buffered_notifications_action import BufferedNotificationsAction -from capif_events.models.subscription_action import SubscriptionAction from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.buffered_notifications_action import BufferedNotificationsAction # noqa: E501 from capif_events.models.subscription_action import SubscriptionAction # noqa: E501 + class MutingExceptionInstructions(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py index ac4ea3d6..a1de5ef7 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class MutingNotificationsSettings(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py index fa4d5259..85bf9cde 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class NotificationFlag(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py index b87ce0b5..b6832cd0 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class NotificationMethod(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py index 5d4c4ba6..42bce003 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py index 01c08428..ae36b029 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py index 1fed743c..e744de1a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class PartitioningCriteria(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/point.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point.py index 25e5dcef..68b096fb 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/point.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.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_Events_API/capif_events/models/point_altitude.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py index e1fbee8d..637b2e25 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.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_Events_API/capif_events/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py index 965fd431..81b375b6 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.uncertainty_ellipse import UncertaintyEllipse from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_events.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_Events_API/capif_events/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py index 8ea7284c..55ac081d 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.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_Events_API/capif_events/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py index 07f77277..515a1d18 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes -from capif_events.models.uncertainty_ellipse import UncertaintyEllipse from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_events.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_Events_API/capif_events/models/polygon.py b/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py index 8804de2c..8d8fe405 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.gad_shape import GADShape -from capif_events.models.geographical_coordinates import GeographicalCoordinates -from capif_events.models.supported_gad_shapes import SupportedGADShapes from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.gad_shape import GADShape # noqa: E501 from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from capif_events.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_Events_API/capif_events/models/problem_details.py b/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py index 4cd85b68..225739b5 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.invalid_param import InvalidParam -import re from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py index 437f5b2a..3fb57d95 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py index f341f1c9..f66c1853 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class PublishedApiPath(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py index 5a994928..eeeb3d31 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class RelativeCartesianLocation(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py index 08e387b0..ac8dde65 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.muting_exception_instructions import MutingExceptionInstructions -from capif_events.models.muting_notifications_settings import MutingNotificationsSettings -from capif_events.models.notification_flag import NotificationFlag -from capif_events.models.notification_method import NotificationMethod -from capif_events.models.partitioning_criteria import PartitioningCriteria from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.muting_exception_instructions import MutingExceptionInstructions # noqa: E501 from capif_events.models.muting_notifications_settings import MutingNotificationsSettings # noqa: E501 from capif_events.models.notification_flag import NotificationFlag # noqa: E501 from capif_events.models.notification_method import NotificationMethod # noqa: E501 from capif_events.models.partitioning_criteria import PartitioningCriteria # noqa: E501 + class ReportingInformation(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py index 8493f59d..a675ea25 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.communication_type import CommunicationType -from capif_events.models.custom_operation import CustomOperation -from capif_events.models.operation import Operation from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.communication_type import CommunicationType # noqa: E501 from capif_events.models.custom_operation import CustomOperation # noqa: E501 from capif_events.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_Events_API/capif_events/models/routing_rule.py b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py index b59d1dd7..abfb9e61 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.aef_profile import AefProfile -from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1 -from capif_events.models.ipv6_address_range import Ipv6AddressRange from capif_events import util - from capif_events.models.aef_profile import AefProfile # noqa: E501 +from capif_events.models.base_model import Model from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1 # noqa: E501 from capif_events.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_Events_API/capif_events/models/security_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py index ff87e785..cf8caff4 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py index 6616b8f4..88daceb2 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.aef_profile import AefProfile -from capif_events.models.api_status import ApiStatus -from capif_events.models.published_api_path import PublishedApiPath -from capif_events.models.shareable_information import ShareableInformation -import re from capif_events import util - from capif_events.models.aef_profile import AefProfile # noqa: E501 from capif_events.models.api_status import ApiStatus # noqa: E501 +from capif_events.models.base_model import Model from capif_events.models.published_api_path import PublishedApiPath # noqa: E501 from capif_events.models.shareable_information import ShareableInformation # noqa: E501 -import re # noqa: E501 + class ServiceAPIDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py b/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py index 7a4789dd..5a536e99 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -import re from capif_events import util +from capif_events.models.base_model import Model -import re # noqa: E501 class ServiceKpis(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py index 7b16c081..c67425be 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class ShareableInformation(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py b/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py index 99ae834d..c0ada57a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class SubscriptionAction(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py index 38ff4d53..919cd5ad 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class SupportedGADShapes(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py index 9a6b6267..0adae28c 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class TimeRangeList(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py index 0a028785..5cb44ed0 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.routing_rule import RoutingRule from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.routing_rule import RoutingRule # noqa: E501 + class TopologyHiding(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py index 627eb52b..88c3675d 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class UncertaintyEllipse(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py index f10fac8f..5e7e36ad 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class UncertaintyEllipsoid(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/version.py b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py index 709e34ce..8185274b 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/version.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model -from capif_events.models.custom_operation import CustomOperation -from capif_events.models.resource import Resource from capif_events import util - +from capif_events.models.base_model import Model from capif_events.models.custom_operation import CustomOperation # noqa: E501 from capif_events.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_Events_API/capif_events/models/websock_notif_config.py b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py index 0077354d..de4a84b0 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_events.models.base_model import Model from capif_events import util +from capif_events.models.base_model import Model class WebsockNotifConfig(Model): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py index c55e721a..8da9951b 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from capif_events.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py b/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py index 7e06036b..79cc892f 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py @@ -1,11 +1,10 @@ import unittest -from flask import json - from capif_events.models.event_subscription import EventSubscription # noqa: E501 from capif_events.models.event_subscription_patch import EventSubscriptionPatch # noqa: E501 from capif_events.models.problem_details import ProblemDetails # noqa: E501 from capif_events.test import BaseTestCase +from flask import json class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_Events_API/setup.py b/services/TS29222_CAPIF_Events_API/setup.py index f6e3cc23..f126a701 100644 --- a/services/TS29222_CAPIF_Events_API/setup.py +++ b/services/TS29222_CAPIF_Events_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "capif_events" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/app.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/app.py index eda5d2bc..56c94af9 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/app.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/app.py @@ -5,6 +5,8 @@ import os from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter @@ -14,9 +16,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config - NAME = "Logging-Service" # Setting log level @@ -30,7 +29,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Logging-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py index 6877196b..c91cce60 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py @@ -1,9 +1,7 @@ -from api_invocation_logs.models.invocation_log import InvocationLog # noqa: E501 - from api_invocation_logs.models.invocation_log import InvocationLog # noqa: E501 from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app +from flask import current_app, request from ..core.invocationlogs import LoggingInvocationOperations from ..core.validate_user import ControlAccess diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py index 43106643..1e8ddf4f 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py @@ -6,11 +6,11 @@ import secrets from flask import current_app from pymongo import ReturnDocument -from .redis_event import RedisEvent -from .resources import Resource -from .responses import internal_server_error, not_found_error, unauthorized_error, make_response from ..encoder import CustomJSONEncoder from ..util import serialize_clean_camel_case +from .redis_event import RedisEvent +from .resources import Resource +from .responses import internal_server_error, make_response, not_found_error, unauthorized_error class LoggingInvocationOperations(Resource): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/redis_event.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/redis_event.py index c65a6a20..8dccdf3d 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/redis_event.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/redis_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import CustomJSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py index c2bdf50f..f3f5cb6f 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py @@ -1,12 +1,12 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import internal_server_error class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py index cfc7e59c..d036df69 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py @@ -1,11 +1,2 @@ # flake8: noqa # import models into model package -from api_invocation_logs.models.interface_description import InterfaceDescription -from api_invocation_logs.models.invalid_param import InvalidParam -from api_invocation_logs.models.invocation_log import InvocationLog -from api_invocation_logs.models.log import Log -from api_invocation_logs.models.o_auth_grant_type import OAuthGrantType -from api_invocation_logs.models.operation import Operation -from api_invocation_logs.models.problem_details import ProblemDetails -from api_invocation_logs.models.protocol import Protocol -from api_invocation_logs.models.security_method import SecurityMethod diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model.py index 642d94a3..d7f252ca 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from api_invocation_logs import util diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py index 10e8ad15..03cb6d5a 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model -from api_invocation_logs.models.o_auth_grant_type import OAuthGrantType -from api_invocation_logs.models.security_method import SecurityMethod -import re from api_invocation_logs import util - +from api_invocation_logs.models.base_model import Model from api_invocation_logs.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from api_invocation_logs.models.security_method import SecurityMethod # noqa: E501 -import re # noqa: E501 + class InterfaceDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py index d7ec5735..18d055db 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model from api_invocation_logs import util +from api_invocation_logs.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py index 6110fce8..e7464b7f 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model -from api_invocation_logs.models.log import Log -import re from api_invocation_logs import util - +from api_invocation_logs.models.base_model import Model from api_invocation_logs.models.log import Log # noqa: E501 -import re # noqa: E501 + class InvocationLog(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py index 41076a09..84715f30 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model -from api_invocation_logs.models.interface_description import InterfaceDescription -from api_invocation_logs.models.operation import Operation -from api_invocation_logs.models.protocol import Protocol from api_invocation_logs import util - +from api_invocation_logs.models.base_model import Model from api_invocation_logs.models.interface_description import InterfaceDescription # noqa: E501 from api_invocation_logs.models.operation import Operation # noqa: E501 from api_invocation_logs.models.protocol import Protocol # noqa: E501 + class Log(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/o_auth_grant_type.py index 1165483f..9c8fcf7d 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model from api_invocation_logs import util +from api_invocation_logs.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py index 513f6d00..a4bea825 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model from api_invocation_logs import util +from api_invocation_logs.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py index 1ab0e54c..0f87859c 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model -from api_invocation_logs.models.invalid_param import InvalidParam -import re from api_invocation_logs import util - +from api_invocation_logs.models.base_model import Model from api_invocation_logs.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py index ec4bf3b2..fe449f01 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model from api_invocation_logs import util +from api_invocation_logs.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py index b47fd3ef..3f0ff15b 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from api_invocation_logs.models.base_model import Model from api_invocation_logs import util +from api_invocation_logs.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/__init__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/__init__.py index 52299ec8..5282c992 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/__init__.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from api_invocation_logs.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/test_default_controller.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/test_default_controller.py index a7819930..1475dbad 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/test/test_default_controller.py @@ -1,10 +1,9 @@ import unittest -from flask import json - from api_invocation_logs.models.invocation_log import InvocationLog # noqa: E501 from api_invocation_logs.models.problem_details import ProblemDetails # noqa: E501 from api_invocation_logs.test import BaseTestCase +from flask import json class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py index 46725d89..aed84929 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "api_invocation_logs" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py index 6cddfc9e..46e0941c 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py @@ -6,6 +6,10 @@ from datetime import datetime from logging.handlers import RotatingFileHandler import connexion +# from published_apis import encoder +import encoder +from config import Config +from core.consumer_messager import Subscriber from flask_apscheduler import APScheduler from flask_executor import Executor from flask_jwt_extended import JWTManager @@ -19,11 +23,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -# from published_apis import encoder -import encoder -from config import Config -from core.consumer_messager import Subscriber - NAME = "Publish-Service" # Setting log level @@ -37,7 +36,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Publish-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py index 4f43631c..27c4b642 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py @@ -2,8 +2,8 @@ from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app -from published_apis.vendor_specific import vendor_specific_key_n_value, find_attribute_in_body +from flask import current_app, request +from published_apis.vendor_specific import find_attribute_in_body, vendor_specific_key_n_value from ..core.responses import bad_request_error from ..core.serviceapidescriptions import PublishServiceOperations diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/individual_apf_published_api_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/individual_apf_published_api_controller.py index 0661991f..78336ca4 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/individual_apf_published_api_controller.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/individual_apf_published_api_controller.py @@ -2,7 +2,7 @@ from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app +from flask import current_app, request from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch # noqa: E501 from ..core.serviceapidescriptions import PublishServiceOperations diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py index 6d294ffd..8b137891 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller.py @@ -1,2 +1 @@ -from typing import List diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py index 34fcdf45..8292de4d 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py @@ -1,5 +1,6 @@ import redis + class Publisher(): def __init__(self): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/redis_event.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/redis_event.py index f80e6b2e..3037ae76 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/redis_event.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/redis_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import JSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py index 7be74822..d5b45175 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py @@ -5,15 +5,21 @@ from datetime import datetime from flask import current_app from pymongo import ReturnDocument +from ..models.service_api_description import ServiceAPIDescription +from ..util import clean_empty, clean_n_camel_case, dict_to_camel_case +from ..vendor_specific import add_vend_spec_fields from .auth_manager import AuthManager from .publisher import Publisher from .redis_event import RedisEvent from .resources import Resource -from .responses import internal_server_error, forbidden_error, not_found_error, unauthorized_error, make_response, \ - bad_request_error -from ..models.service_api_description import ServiceAPIDescription -from ..util import dict_to_camel_case, clean_empty, clean_n_camel_case -from ..vendor_specific import add_vend_spec_fields +from .responses import ( + bad_request_error, + forbidden_error, + internal_server_error, + make_response, + not_found_error, + unauthorized_error +) publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py index 94fe1d4b..1782fe04 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py @@ -1,12 +1,12 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case +from .resources import Resource +from .responses import internal_server_error class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py index 4d957655..6f24878a 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py @@ -1,5 +1,4 @@ from connexion.jsonifier import JSONEncoder - from published_apis.models.base_model import Model diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py index 809cf1b1..d036df69 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py @@ -1,44 +1,2 @@ # flake8: noqa # import models into model package -from published_apis.models.aef_location import AefLocation -from published_apis.models.aef_profile import AefProfile -from published_apis.models.api_status import ApiStatus -from published_apis.models.civic_address import CivicAddress -from published_apis.models.communication_type import CommunicationType -from published_apis.models.custom_operation import CustomOperation -from published_apis.models.data_format import DataFormat -from published_apis.models.ellipsoid_arc import EllipsoidArc -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographic_area import GeographicArea -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.interface_description import InterfaceDescription -from published_apis.models.invalid_param import InvalidParam -from published_apis.models.ip_addr_range import IpAddrRange -from published_apis.models.ipv4_address_range import Ipv4AddressRange -from published_apis.models.ipv6_addr1 import Ipv6Addr1 -from published_apis.models.ipv6_address_range import Ipv6AddressRange -from published_apis.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse -from published_apis.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid -from published_apis.models.local_origin import LocalOrigin -from published_apis.models.o_auth_grant_type import OAuthGrantType -from published_apis.models.operation import Operation -from published_apis.models.point import Point -from published_apis.models.point_altitude import PointAltitude -from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty -from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle -from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from published_apis.models.polygon import Polygon -from published_apis.models.problem_details import ProblemDetails -from published_apis.models.protocol import Protocol -from published_apis.models.published_api_path import PublishedApiPath -from published_apis.models.relative_cartesian_location import RelativeCartesianLocation -from published_apis.models.resource import Resource -from published_apis.models.security_method import SecurityMethod -from published_apis.models.service_api_description import ServiceAPIDescription -from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch -from published_apis.models.service_kpis import ServiceKpis -from published_apis.models.shareable_information import ShareableInformation -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipse import UncertaintyEllipse -from published_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from published_apis.models.version import Version diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py index ccc48596..ca2cc22e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_location.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.civic_address import CivicAddress -from published_apis.models.geographic_area import GeographicArea from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.civic_address import CivicAddress # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/aef_profile.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py index 249c595e..b50b23b7 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py @@ -1,20 +1,9 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.aef_location import AefLocation -from published_apis.models.data_format import DataFormat -from published_apis.models.interface_description import InterfaceDescription -from published_apis.models.ip_addr_range import IpAddrRange -from published_apis.models.o_auth_grant_type import OAuthGrantType -from published_apis.models.protocol import Protocol -from published_apis.models.security_method import SecurityMethod -from published_apis.models.service_kpis import ServiceKpis -from published_apis.models.version import Version from published_apis import util - from published_apis.models.aef_location import AefLocation # noqa: E501 +from published_apis.models.base_model import Model from published_apis.models.data_format import DataFormat # noqa: E501 from published_apis.models.interface_description import InterfaceDescription # noqa: E501 from published_apis.models.ip_addr_range import IpAddrRange # noqa: E501 @@ -24,6 +13,7 @@ from published_apis.models.security_method import SecurityMethod # noqa: E501 from published_apis.models.service_kpis import ServiceKpis # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/api_status.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py index 0492b259..4fcf0817 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/api_status.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class ApiStatus(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py index ae24c559..d4fac36d 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from published_apis import util diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py index b4fa7c06..2985c188 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/civic_address.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class CivicAddress(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py index a91645f4..34963f38 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class CommunicationType(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py index 1f4a66a6..2900d43e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.communication_type import CommunicationType -from published_apis.models.operation import Operation from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.communication_type import CommunicationType # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/data_format.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py index 5c6c9072..0f79d52e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class DataFormat(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py index ca81b714..9b065e53 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ellipsoid_arc.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/gad_shape.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py index f4754606..370e1da4 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/gad_shape.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.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_Publish_Service_API/published_apis/models/geographic_area.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py index 0fa074cd..226225be 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographic_area.py @@ -1,20 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.ellipsoid_arc import EllipsoidArc -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.point import Point -from published_apis.models.point_altitude import PointAltitude -from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty -from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle -from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from published_apis.models.polygon import Polygon -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipse import UncertaintyEllipse from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.ellipsoid_arc import EllipsoidArc # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.models.point import Point # noqa: E501 @@ -26,6 +14,7 @@ from published_apis.models.polygon import Polygon # noqa: E501 from published_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/geographical_coordinates.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py index 49c59769..253a9089 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/geographical_coordinates.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class GeographicalCoordinates(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py index 9dc53d39..7c8707c4 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.o_auth_grant_type import OAuthGrantType -from published_apis.models.security_method import SecurityMethod -import re from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from published_apis.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). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py index 16472ecc..b7b4d5ce 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py index 7934c226..48c4ede0 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ip_addr_range.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.ipv4_address_range import Ipv4AddressRange -from published_apis.models.ipv6_address_range import Ipv6AddressRange from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 from published_apis.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 + class IpAddrRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py index f72ef00e..2547d74c 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv4_address_range.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -import re from published_apis import util +from published_apis.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py index 268ec666..354ce469 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_addr1.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class Ipv6Addr1(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py index 37f319c8..a28eff1f 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/ipv6_address_range.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.ipv6_addr1 import Ipv6Addr1 from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.ipv6_addr1 import Ipv6Addr1 # noqa: E501 + class Ipv6AddressRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py index 2c575408..2b13ab8c 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local2d_point_uncertainty_ellipse.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.local_origin import LocalOrigin -from published_apis.models.relative_cartesian_location import RelativeCartesianLocation -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipse import UncertaintyEllipse from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.local_origin import LocalOrigin # noqa: E501 from published_apis.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from published_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py index 2dfe87ae..ca17643d 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local3d_point_uncertainty_ellipsoid.py @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.local_origin import LocalOrigin -from published_apis.models.relative_cartesian_location import RelativeCartesianLocation -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipsoid import UncertaintyEllipsoid from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.local_origin import LocalOrigin # noqa: E501 from published_apis.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 from published_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/local_origin.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py index 6686d14d..d86b7142 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/local_origin.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.geographic_area import GeographicArea -from published_apis.models.geographical_coordinates import GeographicalCoordinates from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.geographic_area import GeographicArea # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py index d957daf8..a61d636f 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class OAuthGrantType(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py index 0923ce76..abfa0c22 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class Operation(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py index d16cbaaa..b0d7a764 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/point_altitude.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py index 0fb374f7..7fd826c1 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py index cf96f55d..98b36ca7 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_altitude_uncertainty.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipse import UncertaintyEllipse from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py index 3b773f51..477dfae0 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_circle.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py index ea57f68d..1e328c07 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/point_uncertainty_ellipse.py @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes -from published_apis.models.uncertainty_ellipse import UncertaintyEllipse from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/polygon.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py index 8a3f6baa..d021ee3b 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/polygon.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.gad_shape import GADShape -from published_apis.models.geographical_coordinates import GeographicalCoordinates -from published_apis.models.supported_gad_shapes import SupportedGADShapes from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.gad_shape import GADShape # noqa: E501 from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/problem_details.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py index 41b69ae8..39abad6a 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.invalid_param import InvalidParam -import re from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py index 9eb3203e..011e1942 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class Protocol(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py index 4d3538df..8e02d485 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class PublishedApiPath(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py index 2f17cb84..0d1e9116 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/relative_cartesian_location.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class RelativeCartesianLocation(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py index fe7445df..d00e3ee8 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.communication_type import CommunicationType -from published_apis.models.custom_operation import CustomOperation -from published_apis.models.operation import Operation from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.communication_type import CommunicationType # noqa: E501 from published_apis.models.custom_operation import CustomOperation # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/models/security_method.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py index 59142370..97c264ab 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py index d1c2fef1..0111b908 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.aef_profile import AefProfile -from published_apis.models.api_status import ApiStatus -from published_apis.models.published_api_path import PublishedApiPath -from published_apis.models.shareable_information import ShareableInformation -import re from published_apis import util - from published_apis.models.aef_profile import AefProfile # noqa: E501 from published_apis.models.api_status import ApiStatus # noqa: E501 +from published_apis.models.base_model import Model from published_apis.models.published_api_path import PublishedApiPath # noqa: E501 from published_apis.models.shareable_information import ShareableInformation # noqa: E501 -import re # noqa: E501 + class ServiceAPIDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py index 71dd39c9..283a1a07 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description_patch.py @@ -1,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.aef_profile import AefProfile -from published_apis.models.api_status import ApiStatus -from published_apis.models.published_api_path import PublishedApiPath -from published_apis.models.shareable_information import ShareableInformation -import re from published_apis import util - from published_apis.models.aef_profile import AefProfile # noqa: E501 from published_apis.models.api_status import ApiStatus # noqa: E501 +from published_apis.models.base_model import Model from published_apis.models.published_api_path import PublishedApiPath # noqa: E501 from published_apis.models.shareable_information import ShareableInformation # noqa: E501 -import re # noqa: E501 + class ServiceAPIDescriptionPatch(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py index f4b8ae12..ac1a773e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_kpis.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -import re from published_apis import util +from published_apis.models.base_model import Model -import re # noqa: E501 class ServiceKpis(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py index ff4aea1c..a2dfbeaf 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class ShareableInformation(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py index 50d7db72..095abd0a 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/supported_gad_shapes.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class SupportedGADShapes(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py index 2aef9633..44957aa6 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipse.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class UncertaintyEllipse(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py index 88a428d4..0a341783 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/uncertainty_ellipsoid.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model from published_apis import util +from published_apis.models.base_model import Model class UncertaintyEllipsoid(Model): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py index 4126d65a..4188ad79 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from published_apis.models.base_model import Model -from published_apis.models.custom_operation import CustomOperation -from published_apis.models.resource import Resource from published_apis import util - +from published_apis.models.base_model import Model from published_apis.models.custom_operation import CustomOperation # noqa: E501 from published_apis.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_Publish_Service_API/published_apis/test/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py index 108a343a..07e31c34 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/__init__.py @@ -2,7 +2,6 @@ import logging import connexion from flask_testing import TestCase - from published_apis.encoder import JSONEncoder diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py index f194cded..aa3a20d4 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_default_controller.py @@ -1,7 +1,6 @@ import unittest from flask import json - from published_apis.models.problem_details import ProblemDetails # noqa: E501 from published_apis.models.service_api_description import ServiceAPIDescription # noqa: E501 from published_apis.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py index c9978525..c9664f15 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/test/test_individual_apf_published_api_controller.py @@ -1,7 +1,6 @@ import unittest from flask import json - from published_apis.models.problem_details import ProblemDetails # noqa: E501 from published_apis.models.service_api_description import ServiceAPIDescription # noqa: E501 from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch # noqa: E501 diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py index 2e3d203f..1b195665 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py @@ -1,6 +1,5 @@ import datetime -import typing from published_apis import typing_utils diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/vendor_specific.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/vendor_specific.py index 21fd6b6d..97cfd800 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/vendor_specific.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/vendor_specific.py @@ -1,5 +1,6 @@ import re + def find_attribute_in_body(test, path): f_key = [] if type(test) == dict: diff --git a/services/TS29222_CAPIF_Publish_Service_API/setup.py b/services/TS29222_CAPIF_Publish_Service_API/setup.py index 5ae15b44..9cd039a1 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/setup.py +++ b/services/TS29222_CAPIF_Publish_Service_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "published_apis" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/app.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/app.py index 48e8769b..4df40da6 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/app.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/app.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import connexion - import encoder app = connexion.App(__name__, specification_dir='openapi/') 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 9dafc055..575fc245 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 @@ -1,11 +1,6 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union 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/controllers/security_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller.py index 6d294ffd..8b137891 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller.py @@ -1,2 +1 @@ -from typing import List 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 ba7c4d5e..61d252c5 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,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from capif_routing_info.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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 04378bc9..d036df69 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,43 +1,2 @@ # flake8: noqa # import models into model package -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.o_auth_grant_type import OAuthGrantType -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 e60b523e..aede9133 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 @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 2cb26e13..62efcf19 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 @@ -1,20 +1,9 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.o_auth_grant_type import OAuthGrantType -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.base_model import Model 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 @@ -24,6 +13,7 @@ from capif_routing_info.models.security_method import SecurityMethod # noqa: E5 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 48496362..57cac681 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 @@ -1,5 +1,4 @@ import pprint - import typing from capif_routing_info import util 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 fd306ef3..46b947c1 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 c355c6de..84355f1b 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 0e0995b2..d6a2f42a 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 @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 83f31a21..8c400e5e 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 345698c2..246c731e 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 d956d8d2..c4606e3a 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 @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 5c159825..83b2f60a 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 @@ -1,20 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 @@ -26,6 +14,7 @@ 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 8b0e51f2..e33c892b 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 f9b79570..e895f9db 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 @@ -1,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -from capif_routing_info.models.o_auth_grant_type import OAuthGrantType -from capif_routing_info.models.security_method import SecurityMethod -import re from capif_routing_info import util - +from capif_routing_info.models.base_model import Model from capif_routing_info.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from capif_routing_info.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). 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 e6d4edec..b42e24b5 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 d470760f..b9869baf 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 @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 e4a0b763..cdde631b 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 @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -import re from capif_routing_info import util +from capif_routing_info.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange(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_range1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py index ca5d5f4a..beae3e04 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 @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -import re from capif_routing_info import util +from capif_routing_info.models.base_model import Model -import re # noqa: E501 class Ipv4AddressRange1(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/ipv6_addr1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py index f4248ba8..bfe95315 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 aeaff9c1..c419f267 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 a1060d8a..2efedbc2 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 @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 c9b258b1..e1f2f11d 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 @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 076c7f49..f494ead2 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 @@ -1,21 +1,15 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 0b89a0dc..a301c3ac 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 @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -from capif_routing_info.models.geographic_area import GeographicArea -from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates from capif_routing_info import util - +from capif_routing_info.models.base_model import Model from capif_routing_info.models.geographic_area import GeographicArea # 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/o_auth_grant_type.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py index 420b4513..eabc37f6 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model class OAuthGrantType(Model): 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 856dc775..b72c36a0 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 88b0a922..a6f38782 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 ff5cab9e..72156c95 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 fdcea5e2..63f0459a 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 @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 80faac43..7a7e2cd8 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 03c55bf7..df271216 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 @@ -1,19 +1,14 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 3af36a1e..c4e0ed43 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 096c04eb..d095ab5a 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 @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -from capif_routing_info.models.invalid_param import InvalidParam -import re from capif_routing_info import util - +from capif_routing_info.models.base_model import Model from capif_routing_info.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). 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 fe4b2bf3..59c0a37d 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 592f4bc6..b71e9ce1 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 c6540878..ee34d66f 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 8d086045..9615bb65 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 @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 88cb2c7a..f5072e73 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 @@ -1,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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 0ef293df..948a0e08 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 869dc5a3..b06404f7 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 @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model -import re from capif_routing_info import util +from capif_routing_info.models.base_model import Model -import re # noqa: E501 class ServiceKpis(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/supported_gad_shapes.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py index e238c97b..ef3f27ba 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 27a6acd1..00d8acb9 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 45538ba7..c1307ee3 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 @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_routing_info.models.base_model import Model from capif_routing_info import util +from capif_routing_info.models.base_model import Model 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 1be123dc..990be9ce 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 @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 capif_routing_info.models.base_model import Model 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 e95f59cf..fe016ad6 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 @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from capif_routing_info.encoder import JSONEncoder +from flask_testing import TestCase 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 7241b494..cf2e7c38 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 @@ -1,7 +1,5 @@ import unittest -from flask import json - 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 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 6f369d51..fc17a1ca 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,6 +1,5 @@ import datetime -import typing from capif_routing_info import typing_utils diff --git a/services/TS29222_CAPIF_Routing_Info_API/setup.py b/services/TS29222_CAPIF_Routing_Info_API/setup.py index f3e2e6ad..327037e0 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/setup.py +++ b/services/TS29222_CAPIF_Routing_Info_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "capif_routing_info" VERSION = "1.0.0" diff --git a/services/TS29222_CAPIF_Security_API/capif_security/app.py b/services/TS29222_CAPIF_Security_API/capif_security/app.py index c61896ee..f4f39fde 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/app.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/app.py @@ -6,6 +6,9 @@ from datetime import datetime from logging.handlers import RotatingFileHandler import connexion +import encoder +from config import Config +from core.consumer_messager import Subscriber from flask_apscheduler import APScheduler from flask_executor import Executor from flask_jwt_extended import JWTManager @@ -19,10 +22,6 @@ from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator -import encoder -from config import Config -from core.consumer_messager import Subscriber - NAME = "Security-Service" # Setting log level @@ -36,7 +35,7 @@ def configure_monitoring(app, config): fluent_bit_host = config['monitoring']['fluent_bit_host'] fluent_bit_port = config['monitoring']['fluent_bit_port'] fluent_bit_sender = sender.FluentSender('Security-Service', host=fluent_bit_host, port=fluent_bit_port) - propagator = TraceContextTextMapPropagator() + TraceContextTextMapPropagator() tracer_provider = TracerProvider(resource=resource) trace.set_tracer_provider(tracer_provider) 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 8f371687..385d3cfd 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 @@ -5,7 +5,7 @@ from capif_security.models.security_notification import SecurityNotification # from capif_security.models.service_security import ServiceSecurity # noqa: E501 from cryptography import x509 from cryptography.hazmat.backends import default_backend -from flask import request, current_app +from flask import current_app, request from ..core.publisher import Publisher from ..core.redis_internal_event import RedisInternalEvent diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/redis_event.py b/services/TS29222_CAPIF_Security_API/capif_security/core/redis_event.py index c65a6a20..8dccdf3d 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/redis_event.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/redis_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import CustomJSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/redis_internal_event.py b/services/TS29222_CAPIF_Security_API/capif_security/core/redis_internal_event.py index 50e34342..c1ad0973 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/redis_internal_event.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/redis_internal_event.py @@ -1,7 +1,7 @@ import json -from .publisher import Publisher from ..encoder import JSONEncoder +from .publisher import Publisher publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py b/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py index e0a9041b..2cbc3e77 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py @@ -9,14 +9,14 @@ from flask import current_app from flask_jwt_extended import create_access_token from pymongo import ReturnDocument -from .redis_event import RedisEvent -from .resources import Resource -from .responses import not_found_error, make_response, bad_request_error, internal_server_error, forbidden_error from ..core.publisher import Publisher from ..models.access_token_claims import AccessTokenClaims from ..models.access_token_err import AccessTokenErr from ..models.access_token_rsp import AccessTokenRsp -from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case +from ..util import clean_empty, dict_to_camel_case, serialize_clean_camel_case +from .redis_event import RedisEvent +from .resources import Resource +from .responses import bad_request_error, forbidden_error, internal_server_error, make_response, not_found_error publish_ops = Publisher() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py index c3f70049..29180d1a 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py @@ -1,11 +1,11 @@ import json -from flask import current_app, Response +from flask import Response, current_app -from .resources import Resource -from .responses import internal_server_error, serialize_clean_camel_case from ..encoder import CustomJSONEncoder from ..models.problem_details import ProblemDetails +from .resources import Resource +from .responses import internal_server_error, serialize_clean_camel_case class ControlAccess(Resource): 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 f4510143..d036df69 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py @@ -1,30 +1,2 @@ # flake8: noqa # import models into model package -from capif_security.models.access_token_claims import AccessTokenClaims -from capif_security.models.access_token_err import AccessTokenErr -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.interface_description import InterfaceDescription -from capif_security.models.invalid_param import InvalidParam -from capif_security.models.invalid_param1 import InvalidParam1 -from capif_security.models.ml_model_inter_ind import MlModelInterInd -from capif_security.models.nf_type import NFType -from capif_security.models.no_profile_match_info import NoProfileMatchInfo -from capif_security.models.no_profile_match_reason import NoProfileMatchReason -from capif_security.models.nwdaf_event import NwdafEvent -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_notification import SecurityNotification -from capif_security.models.service_security import ServiceSecurity -from capif_security.models.snssai import Snssai -from capif_security.models.websock_notif_config import WebsockNotifConfig 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 46593ae6..61a482b6 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,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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). 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 c6002302..3e7629b5 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class AccessTokenErr(Model): 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 23007798..efd3e8f4 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class AccessTokenErr1(Model): 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 d82703e3..0530651a 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,24 +1,16 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.ml_model_inter_ind import MlModelInterInd -from capif_security.models.nf_type import NFType -from capif_security.models.nwdaf_event import NwdafEvent -from capif_security.models.plmn_id import PlmnId -from capif_security.models.plmn_id_nid import PlmnIdNid -from capif_security.models.snssai import Snssai -import re from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.ml_model_inter_ind import MlModelInterInd # noqa: E501 from capif_security.models.nf_type import NFType # noqa: E501 from capif_security.models.nwdaf_event import NwdafEvent # noqa: E501 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 -import re # noqa: E501 + class AccessTokenReq1(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/access_token_rsp.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py index f8e524db..477f3a63 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class AccessTokenRsp(Model): 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 index 4bf93155..32a1219f 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/base_model.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/base_model.py @@ -1,5 +1,4 @@ import pprint - import typing from capif_security import util 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 227ba107..b4fbd86e 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class Cause(Model): 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 ade7fc69..b414ef8b 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,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.o_auth_grant_type import OAuthGrantType -from capif_security.models.security_method import SecurityMethod -import re from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.o_auth_grant_type import OAuthGrantType # noqa: E501 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). 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 f86b2086..57a65695 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class InvalidParam(Model): 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 77919000..e7abd4e9 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class InvalidParam1(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/ml_model_inter_ind.py b/services/TS29222_CAPIF_Security_API/capif_security/models/ml_model_inter_ind.py index 3e87273d..c1ab27a7 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/ml_model_inter_ind.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/ml_model_inter_ind.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.nwdaf_event import NwdafEvent from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.nwdaf_event import NwdafEvent # noqa: E501 + class MlModelInterInd(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.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py index 184a7c0d..017f0384 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class NFType(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_info.py b/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_info.py index 4d8885b5..c7b85407 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_info.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_info.py @@ -1,15 +1,12 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.no_profile_match_reason import NoProfileMatchReason -from capif_security.models.query_param_combination import QueryParamCombination from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.no_profile_match_reason import NoProfileMatchReason # noqa: E501 from capif_security.models.query_param_combination import QueryParamCombination # noqa: E501 + class NoProfileMatchInfo(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/no_profile_match_reason.py b/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_reason.py index ccec0b37..5fe37d57 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_reason.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/no_profile_match_reason.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class NoProfileMatchReason(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/nwdaf_event.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nwdaf_event.py index f07de0c3..d1701a39 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/nwdaf_event.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/nwdaf_event.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class NwdafEvent(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Security_API/capif_security/models/o_auth_grant_type.py index 8bace2b9..3813c056 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/o_auth_grant_type.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/o_auth_grant_type.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class OAuthGrantType(Model): 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 74dd8bf0..c86104bb 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,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -import re from capif_security import util +from capif_security.models.base_model import Model -import re # noqa: E501 class PlmnId(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/plmn_id_nid.py b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py index 02bfde85..9e414876 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,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -import re from capif_security import util +from capif_security.models.base_model import Model -import re # noqa: E501 class PlmnIdNid(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/problem_details.py b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py index f24710e4..47dd078a 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.invalid_param import InvalidParam -import re from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.invalid_param import InvalidParam # noqa: E501 -import re # noqa: E501 + class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). 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 27b782fc..e0fbf4c1 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,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/query_param_combination.py b/services/TS29222_CAPIF_Security_API/capif_security/models/query_param_combination.py index a28fb4ad..430eab7c 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/query_param_combination.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/query_param_combination.py @@ -1,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.query_parameter import QueryParameter from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.query_parameter import QueryParameter # noqa: E501 + class QueryParamCombination(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/query_parameter.py b/services/TS29222_CAPIF_Security_API/capif_security/models/query_parameter.py index 183bb325..39302f5b 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/query_parameter.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/query_parameter.py @@ -1,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class QueryParameter(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/res_owner_id.py b/services/TS29222_CAPIF_Security_API/capif_security/models/res_owner_id.py index 0229dd1f..7ad71592 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/res_owner_id.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/res_owner_id.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -import re from capif_security import util +from capif_security.models.base_model import Model -import re # noqa: E501 class ResOwnerId(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/security_information.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py index 10e85193..ab650a4a 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,17 +1,13 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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.base_model import Model 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): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). 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 c319a38a..c3deabe5 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class SecurityMethod(Model): 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 538c655f..fbf39b6d 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -from capif_security.models.cause import Cause from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.cause import Cause # noqa: E501 + class SecurityNotification(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/service_security.py b/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py index c0bae73e..10d26438 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,16 +1,12 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -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 from capif_security import util - +from capif_security.models.base_model import Model from capif_security.models.security_information import SecurityInformation # noqa: E501 from capif_security.models.websock_notif_config import WebsockNotifConfig # noqa: E501 -import re # noqa: E501 + class ServiceSecurity(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/snssai.py b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py index 1d00dd90..90cde98e 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py @@ -1,12 +1,10 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model -import re from capif_security import util +from capif_security.models.base_model import Model -import re # noqa: E501 class Snssai(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/websock_notif_config.py b/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py index 1482ee7d..13109aa1 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,9 +1,8 @@ from datetime import date, datetime # noqa: F401 +from typing import Dict, List # noqa: F401 -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model import Model from capif_security import util +from capif_security.models.base_model import Model class WebsockNotifConfig(Model): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/test/__init__.py b/services/TS29222_CAPIF_Security_API/capif_security/test/__init__.py index d3c5dca1..aa37efef 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/test/__init__.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/test/__init__.py @@ -1,9 +1,8 @@ import logging import connexion -from flask_testing import TestCase - from capif_security.encoder import JSONEncoder +from flask_testing import TestCase class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/test/test_default_controller.py b/services/TS29222_CAPIF_Security_API/capif_security/test/test_default_controller.py index f89c1c51..da26a6d6 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/test/test_default_controller.py @@ -1,7 +1,5 @@ import unittest -from flask import json - 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 @@ -9,6 +7,7 @@ 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.test import BaseTestCase +from flask import json class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_Security_API/setup.py b/services/TS29222_CAPIF_Security_API/setup.py index 9653f405..f291508a 100644 --- a/services/TS29222_CAPIF_Security_API/setup.py +++ b/services/TS29222_CAPIF_Security_API/setup.py @@ -1,5 +1,5 @@ -import sys -from setuptools import setup, find_packages + +from setuptools import find_packages, setup NAME = "capif_security" VERSION = "1.0.0" diff --git a/services/helper/helper_service/app.py b/services/helper/helper_service/app.py index 6dd56d8c..f43ab73b 100644 --- a/services/helper/helper_service/app.py +++ b/services/helper/helper_service/app.py @@ -2,14 +2,12 @@ import json import logging import os -from db.db import MongoDatabse - import requests -from OpenSSL.crypto import PKey, TYPE_RSA, X509Req, dump_certificate_request, FILETYPE_PEM, dump_privatekey -from flask import Flask - from config import Config from controllers.helper_controller import helper_routes +from db.db import MongoDatabse +from flask import Flask +from OpenSSL.crypto import FILETYPE_PEM, TYPE_RSA, PKey, X509Req, dump_certificate_request, dump_privatekey app = Flask(__name__) config = Config().get_config() diff --git a/services/helper/helper_service/controllers/helper_controller.py b/services/helper/helper_service/controllers/helper_controller.py index 5a8eba34..19b11160 100644 --- a/services/helper/helper_service/controllers/helper_controller.py +++ b/services/helper/helper_service/controllers/helper_controller.py @@ -2,7 +2,7 @@ from config import Config from core.helper_operations import HelperOperations -from flask import Blueprint, request, current_app, jsonify +from flask import Blueprint, current_app, jsonify, request config = Config().get_config() diff --git a/services/helper/helper_service/core/helper_operations.py b/services/helper/helper_service/core/helper_operations.py index 77384cda..f0c1f6d3 100644 --- a/services/helper/helper_service/core/helper_operations.py +++ b/services/helper/helper_service/core/helper_operations.py @@ -4,8 +4,15 @@ import pymongo import requests from config import Config from db.db import MongoDatabse -from flask import jsonify, current_app -from utils.utils import to_snake_case, convert_dict_keys_to_snake_case, validate_snake_case_keys, get_nested_value, convert_value_to_original_type, convert_nested_values +from flask import current_app, jsonify +from utils.utils import ( + convert_dict_keys_to_snake_case, + convert_nested_values, + convert_value_to_original_type, + get_nested_value, + to_snake_case, + validate_snake_case_keys +) class HelperOperations: diff --git a/services/helper/helper_service/utils/utils.py b/services/helper/helper_service/utils/utils.py index a5349309..fce57a34 100644 --- a/services/helper/helper_service/utils/utils.py +++ b/services/helper/helper_service/utils/utils.py @@ -1,6 +1,8 @@ import re + from flask import jsonify + def to_snake_case(text): """ Convert string to snake case. diff --git a/services/register/register_service/app.py b/services/register/register_service/app.py index 8a03c2df..378bf88c 100644 --- a/services/register/register_service/app.py +++ b/services/register/register_service/app.py @@ -4,13 +4,12 @@ import logging import os import requests -from OpenSSL.crypto import PKey, TYPE_RSA, X509Req, dump_certificate_request, FILETYPE_PEM, dump_privatekey -from flask import Flask -from flask_jwt_extended import JWTManager - from config import Config from controllers.register_controller import register_routes from db.db import MongoDatabse +from flask import Flask +from flask_jwt_extended import JWTManager +from OpenSSL.crypto import FILETYPE_PEM, TYPE_RSA, PKey, X509Req, dump_certificate_request, dump_privatekey app = Flask(__name__) diff --git a/services/register/register_service/controllers/register_controller.py b/services/register/register_service/controllers/register_controller.py index 85777ed3..93d7fafd 100644 --- a/services/register/register_service/controllers/register_controller.py +++ b/services/register/register_service/controllers/register_controller.py @@ -7,7 +7,7 @@ import jwt from config import Config from core.register_operations import RegisterOperations from db.db import MongoDatabse -from flask import current_app, jsonify, request, Blueprint +from flask import Blueprint, current_app, jsonify, request from flask_httpauth import HTTPBasicAuth auth = HTTPBasicAuth() diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index 452a8c0d..844ce951 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -5,9 +5,9 @@ from datetime import datetime import requests from config import Config from db.db import MongoDatabse -from flask import jsonify, current_app +from flask import current_app, jsonify from flask_jwt_extended import create_access_token -from utils.utils import to_snake_case, convert_dict_keys_to_snake_case, validate_snake_case_keys +from utils.utils import convert_dict_keys_to_snake_case, to_snake_case, validate_snake_case_keys class RegisterOperations: diff --git a/services/register/register_service/utils/utils.py b/services/register/register_service/utils/utils.py index 067bf1f1..4b38761f 100644 --- a/services/register/register_service/utils/utils.py +++ b/services/register/register_service/utils/utils.py @@ -1,6 +1,8 @@ import re + from flask import jsonify + def to_snake_case(text): """ Convert string to snake case. -- GitLab