From 66344f0895fa06037388d4af476aac20ac63ae84 Mon Sep 17 00:00:00 2001 From: Stavros-Anastasios Charismiadis Date: Tue, 14 Jan 2025 14:29:25 +0200 Subject: [PATCH] Remove unused and optimize imports --- .../api_invoker_management/app.py | 25 +++---- .../api_invoker_management/config.py | 4 +- .../controllers/default_controller.py | 15 ++--- ...pi_invoker_enrolment_details_controller.py | 8 --- .../controllers/security_controller.py | 2 +- .../core/apiinvokerenrolmentdetails.py | 24 +++---- .../core/auth_manager.py | 1 + .../core/consumer_messager.py | 6 +- .../core/redis_event.py | 5 +- .../core/redis_internal_event.py | 5 +- .../api_invoker_management/core/resources.py | 4 +- .../api_invoker_management/core/responses.py | 8 ++- .../core/validate_user.py | 8 ++- .../api_invoker_management/db/db.py | 7 +- .../api_invoker_management/encoder.py | 4 +- .../api_invoker_management/models/__init__.py | 46 ------------- .../models/aef_location.py | 7 +- .../models/aef_profile.py | 13 +--- .../models/api_invoker_enrolment_details.py | 11 +--- .../api_invoker_enrolment_details_patch.py | 7 +- .../api_invoker_management/models/api_list.py | 6 +- .../models/api_status.py | 3 +- .../models/base_model.py | 1 - .../models/civic_address.py | 3 +- .../models/communication_type.py | 3 +- .../models/custom_operation.py | 7 +- .../models/data_format.py | 3 +- .../models/ellipsoid_arc.py | 9 +-- .../models/gad_shape.py | 6 +- .../models/geographic_area.py | 22 +------ .../models/geographical_coordinates.py | 3 +- .../models/interface_description.py | 9 +-- .../models/invalid_param.py | 3 +- .../models/ip_addr_range.py | 7 +- .../models/ipv4_address_range.py | 6 +- .../models/ipv6_addr1.py | 3 +- .../models/ipv6_address_range.py | 6 +- .../local2d_point_uncertainty_ellipse.py | 11 +--- .../local3d_point_uncertainty_ellipsoid.py | 11 +--- .../models/local_origin.py | 6 +- .../models/onboarding_information.py | 3 +- .../models/onboarding_notification.py | 7 +- .../models/operation.py | 3 +- .../api_invoker_management/models/point.py | 9 +-- .../models/point_altitude.py | 9 +-- .../models/point_altitude_uncertainty.py | 10 +-- .../models/point_uncertainty_circle.py | 9 +-- .../models/point_uncertainty_ellipse.py | 10 +-- .../api_invoker_management/models/polygon.py | 9 +-- .../models/problem_details.py | 9 +-- .../api_invoker_management/models/protocol.py | 3 +- .../models/published_api_path.py | 3 +- .../models/relative_cartesian_location.py | 3 +- .../api_invoker_management/models/resource.py | 8 +-- .../models/security_method.py | 3 +- .../models/service_api_description.py | 12 +--- .../models/service_kpis.py | 6 +- .../models/shareable_information.py | 3 +- .../models/supported_gad_shapes.py | 3 +- .../models/uncertainty_ellipse.py | 3 +- .../models/uncertainty_ellipsoid.py | 3 +- .../api_invoker_management/models/version.py | 7 +- .../models/websock_notif_config.py | 3 +- .../api_invoker_management/test/__init__.py | 3 +- .../test/test_default_controller.py | 5 +- ...pi_invoker_enrolment_details_controller.py | 6 +- .../api_invoker_management/typing_utils.py | 1 - .../api_invoker_management/util.py | 2 +- .../setup.py | 1 - .../api_provider_management/app.py | 18 +++-- .../api_provider_management/config.py | 4 +- .../controllers/default_controller.py | 15 ++--- ...i_provider_enrolment_details_controller.py | 10 +-- .../controllers/security_controller.py | 2 +- .../core/auth_manager.py | 1 + .../core/provider_enrolment_details_api.py | 17 ++--- .../core/redis_internal_event.py | 5 +- .../api_provider_management/core/resources.py | 4 +- .../api_provider_management/core/responses.py | 8 ++- .../core/sign_certificate.py | 5 +- .../core/validate_user.py | 8 ++- .../api_provider_management/db/db.py | 9 +-- .../api_provider_management/encoder.py | 1 - .../models/__init__.py | 7 -- .../models/api_provider_enrolment_details.py | 9 +-- .../api_provider_enrolment_details_patch.py | 6 +- .../models/api_provider_func_role.py | 3 +- .../models/api_provider_function_details.py | 7 +- .../models/base_model.py | 1 - .../models/invalid_param.py | 3 +- .../models/problem_details.py | 9 +-- .../models/registration_information.py | 3 +- .../api_provider_management/test/__init__.py | 3 +- .../test/test_default_controller.py | 5 +- ...i_provider_enrolment_details_controller.py | 6 +- .../api_provider_management/typing_utils.py | 1 - .../api_provider_management/util.py | 2 +- .../setup.py | 1 - .../capif_acl/app.py | 29 ++++----- .../capif_acl/config.py | 4 +- .../controllers/default_controller.py | 13 +--- .../controllers/security_controller.py | 2 +- .../capif_acl/core/accesscontrolpolicyapi.py | 5 +- .../capif_acl/core/consumer_messager.py | 6 +- .../capif_acl/core/internal_service_ops.py | 7 +- .../capif_acl/core/redis_event.py | 4 +- .../capif_acl/core/resources.py | 1 + .../capif_acl/core/responses.py | 10 +-- .../capif_acl/db/db.py | 9 +-- .../capif_acl/encoder.py | 4 +- .../capif_acl/models/__init__.py | 5 -- .../models/access_control_policy_list.py | 6 +- .../capif_acl/models/api_invoker_policy.py | 6 +- .../capif_acl/models/base_model.py | 1 - .../capif_acl/models/invalid_param.py | 3 +- .../capif_acl/models/problem_details.py | 9 +-- .../capif_acl/models/time_range_list.py | 3 +- .../capif_acl/test/__init__.py | 3 +- .../capif_acl/test/test_default_controller.py | 4 -- .../capif_acl/util.py | 2 +- .../setup.py | 1 - .../TS29222_CAPIF_Auditing_API/logs/app.py | 13 ++-- .../TS29222_CAPIF_Auditing_API/logs/config.py | 4 +- .../logs/controllers/default_controller.py | 13 +--- .../logs/controllers/security_controller.py | 2 +- .../logs/core/auditoperations.py | 8 +-- .../logs/core/resources.py | 1 + .../logs/core/responses.py | 8 ++- .../TS29222_CAPIF_Auditing_API/logs/db/db.py | 7 +- .../logs/encoder.py | 1 - .../logs/models/__init__.py | 10 --- .../logs/models/base_model.py | 1 - .../logs/models/interface_description.py | 9 +-- .../logs/models/invalid_param.py | 3 +- .../logs/models/invocation_log.py | 9 +-- .../logs/models/invocation_logs.py | 9 +-- .../models/invocation_logs_retrieve_res.py | 12 +--- .../logs/models/log.py | 8 +-- .../logs/models/operation.py | 3 +- .../logs/models/problem_details.py | 9 +-- .../logs/models/protocol.py | 3 +- .../logs/models/security_method.py | 3 +- .../logs/test/__init__.py | 1 - .../logs/test/test_default_controller.py | 7 -- .../logs/typing_utils.py | 1 - .../TS29222_CAPIF_Auditing_API/logs/util.py | 2 +- services/TS29222_CAPIF_Auditing_API/setup.py | 1 - .../service_apis/app.py | 19 +++--- .../service_apis/config.py | 4 +- .../controllers/default_controller.py | 17 ++--- .../controllers/security_controller.py | 2 +- .../service_apis/core/discoveredapis.py | 13 ++-- .../service_apis/core/resources.py | 4 +- .../service_apis/core/responses.py | 8 ++- .../service_apis/db/db.py | 9 +-- .../service_apis/encoder.py | 1 - .../service_apis/models/__init__.py | 42 ------------ .../service_apis/models/aef_location.py | 7 +- .../service_apis/models/aef_profile.py | 13 +--- .../service_apis/models/api_status.py | 3 +- .../service_apis/models/base_model.py | 1 - .../service_apis/models/civic_address.py | 3 +- .../service_apis/models/communication_type.py | 3 +- .../service_apis/models/custom_operation.py | 7 +- .../service_apis/models/data_format.py | 3 +- .../service_apis/models/discovered_apis.py | 6 +- .../service_apis/models/ellipsoid_arc.py | 9 +-- .../service_apis/models/gad_shape.py | 6 +- .../service_apis/models/geographic_area.py | 22 +------ .../models/geographical_coordinates.py | 3 +- .../models/interface_description.py | 9 +-- .../service_apis/models/invalid_param.py | 3 +- .../service_apis/models/ip_addr_info.py | 3 +- .../service_apis/models/ip_addr_range.py | 7 +- .../service_apis/models/ipv4_address_range.py | 6 +- .../service_apis/models/ipv6_addr1.py | 3 +- .../service_apis/models/ipv6_address_range.py | 6 +- .../local2d_point_uncertainty_ellipse.py | 11 +--- .../local3d_point_uncertainty_ellipsoid.py | 11 +--- .../service_apis/models/local_origin.py | 6 +- .../service_apis/models/operation.py | 3 +- .../service_apis/models/point.py | 9 +-- .../service_apis/models/point_altitude.py | 9 +-- .../models/point_altitude_uncertainty.py | 10 +-- .../models/point_uncertainty_circle.py | 9 +-- .../models/point_uncertainty_ellipse.py | 10 +-- .../service_apis/models/polygon.py | 9 +-- .../service_apis/models/problem_details.py | 9 +-- .../service_apis/models/protocol.py | 3 +- .../service_apis/models/published_api_path.py | 3 +- .../models/relative_cartesian_location.py | 3 +- .../service_apis/models/resource.py | 8 +-- .../service_apis/models/security_method.py | 3 +- .../models/service_api_description.py | 12 +--- .../service_apis/models/service_kpis.py | 6 +- .../models/shareable_information.py | 3 +- .../models/supported_gad_shapes.py | 3 +- .../models/uncertainty_ellipse.py | 3 +- .../models/uncertainty_ellipsoid.py | 3 +- .../service_apis/models/version.py | 7 +- .../service_apis/test/__init__.py | 1 - .../test/test_default_controller.py | 10 --- .../service_apis/typing_utils.py | 1 - .../service_apis/util.py | 1 - .../setup.py | 1 - .../capif_events/app.py | 35 ++++------ .../capif_events/config.py | 4 +- .../controllers/default_controller.py | 18 ++--- .../controllers/security_controller.py | 2 +- .../capif_events/core/auth_manager.py | 3 +- .../capif_events/core/consumer_messager.py | 12 ++-- .../capif_events/core/events_apis.py | 16 ++--- .../capif_events/core/internal_event_ops.py | 4 +- .../capif_events/core/notifications.py | 23 ++++--- .../capif_events/core/resources.py | 4 +- .../capif_events/core/responses.py | 8 ++- .../capif_events/core/validate_user.py | 8 ++- .../capif_events/db/db.py | 10 +-- .../capif_events/encoder.py | 4 +- .../capif_events/models/__init__.py | 65 ------------------- .../models/access_control_policy_list.py | 6 +- .../models/access_control_policy_list_ext.py | 6 +- .../capif_events/models/aef_location.py | 7 +- .../capif_events/models/aef_profile.py | 13 +--- .../capif_events/models/api_invoker_policy.py | 6 +- .../capif_events/models/api_status.py | 3 +- .../capif_events/models/base_model.py | 1 - .../models/buffered_notifications_action.py | 3 +- .../capif_events/models/capif_event.py | 3 +- .../capif_events/models/capif_event_detail.py | 9 +-- .../capif_events/models/capif_event_filter.py | 3 +- .../capif_events/models/civic_address.py | 3 +- .../capif_events/models/communication_type.py | 3 +- .../capif_events/models/custom_operation.py | 7 +- .../capif_events/models/data_format.py | 3 +- .../capif_events/models/ellipsoid_arc.py | 9 +-- .../capif_events/models/event_notification.py | 7 +- .../capif_events/models/event_subscription.py | 12 +--- .../models/event_subscription_patch.py | 8 +-- .../capif_events/models/gad_shape.py | 6 +- .../capif_events/models/geographic_area.py | 22 +------ .../models/geographical_coordinates.py | 3 +- .../models/interface_description.py | 9 +-- .../capif_events/models/invalid_param.py | 3 +- .../capif_events/models/invocation_log.py | 9 +-- .../capif_events/models/ip_addr_range.py | 7 +- .../capif_events/models/ipv4_address_range.py | 6 +- .../models/ipv4_address_range1.py | 6 +- .../capif_events/models/ipv6_addr1.py | 3 +- .../capif_events/models/ipv6_address_range.py | 3 +- .../models/ipv6_address_range1.py | 6 +- .../local2d_point_uncertainty_ellipse.py | 11 +--- .../local3d_point_uncertainty_ellipsoid.py | 11 +--- .../capif_events/models/local_origin.py | 6 +- .../capif_events/models/log.py | 8 +-- .../models/muting_exception_instructions.py | 7 +- .../models/muting_notifications_settings.py | 3 +- .../capif_events/models/notification_flag.py | 3 +- .../models/notification_method.py | 3 +- .../capif_events/models/operation.py | 3 +- .../models/partitioning_criteria.py | 3 +- .../capif_events/models/point.py | 9 +-- .../capif_events/models/point_altitude.py | 9 +-- .../models/point_altitude_uncertainty.py | 10 +-- .../models/point_uncertainty_circle.py | 9 +-- .../models/point_uncertainty_ellipse.py | 10 +-- .../capif_events/models/polygon.py | 9 +-- .../capif_events/models/problem_details.py | 9 +-- .../capif_events/models/protocol.py | 3 +- .../capif_events/models/published_api_path.py | 3 +- .../models/relative_cartesian_location.py | 3 +- .../models/reporting_information.py | 10 +-- .../capif_events/models/resource.py | 8 +-- .../capif_events/models/routing_rule.py | 8 +-- .../capif_events/models/security_method.py | 3 +- .../models/service_api_description.py | 12 +--- .../capif_events/models/service_kpis.py | 6 +- .../models/shareable_information.py | 3 +- .../models/subscription_action.py | 3 +- .../models/supported_gad_shapes.py | 3 +- .../capif_events/models/time_range_list.py | 3 +- .../capif_events/models/topology_hiding.py | 6 +- .../models/uncertainty_ellipse.py | 3 +- .../models/uncertainty_ellipsoid.py | 3 +- .../capif_events/models/version.py | 7 +- .../models/websock_notif_config.py | 3 +- .../capif_events/test/__init__.py | 3 +- .../test/test_default_controller.py | 6 +- .../capif_events/typing_utils.py | 1 - .../capif_events/util.py | 2 +- services/TS29222_CAPIF_Events_API/setup.py | 1 - .../api_invocation_logs/app.py | 13 ++-- .../api_invocation_logs/config.py | 4 +- .../controllers/default_controller.py | 15 ++--- .../controllers/security_controller.py | 2 +- .../core/invocationlogs.py | 13 ++-- .../api_invocation_logs/core/publisher.py | 3 +- .../api_invocation_logs/core/redis_event.py | 5 +- .../api_invocation_logs/core/resources.py | 1 + .../api_invocation_logs/core/responses.py | 8 ++- .../api_invocation_logs/core/validate_user.py | 8 ++- .../api_invocation_logs/db/db.py | 7 +- .../api_invocation_logs/encoder.py | 4 +- .../api_invocation_logs/models/__init__.py | 8 --- .../api_invocation_logs/models/base_model.py | 1 - .../models/interface_description.py | 9 +-- .../models/invalid_param.py | 3 +- .../models/invocation_log.py | 9 +-- .../api_invocation_logs/models/log.py | 8 +-- .../api_invocation_logs/models/operation.py | 3 +- .../models/problem_details.py | 9 +-- .../api_invocation_logs/models/protocol.py | 3 +- .../models/security_method.py | 3 +- .../api_invocation_logs/test/__init__.py | 3 +- .../test/test_default_controller.py | 5 +- .../api_invocation_logs/typing_utils.py | 1 - .../api_invocation_logs/util.py | 1 - .../setup.py | 1 - .../published_apis/app.py | 31 +++++---- .../published_apis/config.py | 4 +- .../controllers/default_controller.py | 13 ++-- ...individual_apf_published_api_controller.py | 16 ++--- .../controllers/security_controller.py | 2 +- .../published_apis/core/auth_manager.py | 1 + .../published_apis/core/consumer_messager.py | 6 +- .../core/internal_service_ops.py | 4 +- .../published_apis/core/redis_event.py | 5 +- .../published_apis/core/resources.py | 1 + .../published_apis/core/responses.py | 9 +-- .../core/serviceapidescriptions.py | 17 +++-- .../published_apis/core/validate_user.py | 8 ++- .../published_apis/db/db.py | 9 +-- .../published_apis/encoder.py | 1 - .../published_apis/models/__init__.py | 41 ------------ .../published_apis/models/aef_location.py | 7 +- .../published_apis/models/aef_profile.py | 13 +--- .../published_apis/models/api_status.py | 3 +- .../published_apis/models/base_model.py | 1 - .../published_apis/models/civic_address.py | 3 +- .../models/communication_type.py | 3 +- .../published_apis/models/custom_operation.py | 7 +- .../published_apis/models/data_format.py | 3 +- .../published_apis/models/ellipsoid_arc.py | 9 +-- .../published_apis/models/gad_shape.py | 6 +- .../published_apis/models/geographic_area.py | 22 +------ .../models/geographical_coordinates.py | 3 +- .../models/interface_description.py | 9 +-- .../published_apis/models/invalid_param.py | 3 +- .../published_apis/models/ip_addr_range.py | 7 +- .../models/ipv4_address_range.py | 6 +- .../published_apis/models/ipv6_addr1.py | 3 +- .../models/ipv6_address_range.py | 6 +- .../local2d_point_uncertainty_ellipse.py | 11 +--- .../local3d_point_uncertainty_ellipsoid.py | 11 +--- .../published_apis/models/local_origin.py | 6 +- .../published_apis/models/operation.py | 3 +- .../published_apis/models/point.py | 9 +-- .../published_apis/models/point_altitude.py | 9 +-- .../models/point_altitude_uncertainty.py | 10 +-- .../models/point_uncertainty_circle.py | 9 +-- .../models/point_uncertainty_ellipse.py | 10 +-- .../published_apis/models/polygon.py | 9 +-- .../published_apis/models/problem_details.py | 9 +-- .../published_apis/models/protocol.py | 3 +- .../models/published_api_path.py | 3 +- .../models/relative_cartesian_location.py | 3 +- .../published_apis/models/resource.py | 8 +-- .../published_apis/models/security_method.py | 3 +- .../models/service_api_description.py | 12 +--- .../models/service_api_description_patch.py | 12 +--- .../published_apis/models/service_kpis.py | 6 +- .../models/shareable_information.py | 3 +- .../models/supported_gad_shapes.py | 3 +- .../models/uncertainty_ellipse.py | 3 +- .../models/uncertainty_ellipsoid.py | 3 +- .../published_apis/models/version.py | 7 +- .../published_apis/test/__init__.py | 1 - .../test/test_default_controller.py | 3 - ...individual_apf_published_api_controller.py | 4 -- .../published_apis/typing_utils.py | 1 - .../published_apis/util.py | 2 +- .../setup.py | 1 - .../capif_routing_info/app.py | 2 +- .../capif_routing_info/models/__init__.py | 40 ------------ .../capif_routing_info/models/aef_location.py | 7 +- .../capif_routing_info/models/aef_profile.py | 13 +--- .../capif_routing_info/models/base_model.py | 1 - .../models/civic_address.py | 3 +- .../models/communication_type.py | 3 +- .../models/custom_operation.py | 7 +- .../capif_routing_info/models/data_format.py | 3 +- .../models/ellipsoid_arc.py | 9 +-- .../capif_routing_info/models/gad_shape.py | 6 +- .../models/geographic_area.py | 22 +------ .../models/interface_description.py | 9 +-- .../models/invalid_param.py | 3 +- .../models/ip_addr_range.py | 7 +- .../models/ipv4_address_range.py | 6 +- .../models/ipv4_address_range1.py | 6 +- .../capif_routing_info/models/ipv6_addr1.py | 3 +- .../models/ipv6_address_range.py | 3 +- .../models/ipv6_address_range1.py | 6 +- .../capif_routing_info/models/local_origin.py | 6 +- .../capif_routing_info/models/operation.py | 3 +- .../capif_routing_info/models/point.py | 9 +-- .../models/point_altitude.py | 9 +-- .../capif_routing_info/models/polygon.py | 9 +-- .../models/problem_details.py | 9 +-- .../capif_routing_info/models/protocol.py | 3 +- .../capif_routing_info/models/resource.py | 8 +-- .../capif_routing_info/models/routing_info.py | 6 +- .../capif_routing_info/models/routing_rule.py | 8 +-- .../models/security_method.py | 3 +- .../capif_routing_info/models/service_kpis.py | 6 +- .../models/supported_gad_shapes.py | 3 +- .../models/uncertainty_ellipse.py | 3 +- .../capif_routing_info/models/version.py | 7 +- .../capif_routing_info/test/__init__.py | 3 +- .../test/test_default_controller.py | 4 -- .../TS29222_CAPIF_Routing_Info_API/setup.py | 1 - .../capif_security/app.py | 24 +++---- .../capif_security/config.py | 4 +- .../controllers/default_controller.py | 13 ++-- .../controllers/security_controller.py | 2 +- .../capif_security/core/consumer_messager.py | 6 +- .../capif_security/core/notification.py | 3 +- .../capif_security/core/redis_event.py | 5 +- .../core/redis_internal_event.py | 5 +- .../capif_security/core/resources.py | 2 + .../capif_security/core/responses.py | 8 ++- .../capif_security/core/servicesecurity.py | 18 ++--- .../capif_security/core/validate_user.py | 11 ++-- .../capif_security/db/db.py | 10 +-- .../capif_security/encoder.py | 4 +- .../capif_security/models/__init__.py | 26 -------- .../models/access_token_claims.py | 6 +- .../capif_security/models/access_token_err.py | 3 +- .../models/access_token_err1.py | 3 +- .../models/access_token_req1.py | 12 +--- .../capif_security/models/access_token_rsp.py | 3 +- .../capif_security/models/base_model.py | 1 - .../capif_security/models/cause.py | 3 +- .../models/interface_description.py | 9 +-- .../capif_security/models/invalid_param.py | 3 +- .../capif_security/models/invalid_param1.py | 3 +- .../capif_security/models/nf_type.py | 3 +- .../models/no_profile_match_info.py | 7 +- .../models/no_profile_match_reason.py | 3 +- .../models/o_auth_grant_type.py | 3 +- .../capif_security/models/plmn_id.py | 6 +- .../capif_security/models/plmn_id_nid.py | 6 +- .../capif_security/models/problem_details.py | 9 +-- .../capif_security/models/problem_details1.py | 12 +--- .../models/query_param_combination.py | 6 +- .../capif_security/models/query_parameter.py | 3 +- .../capif_security/models/res_owner_id.py | 6 +- .../models/security_information.py | 8 +-- .../capif_security/models/security_method.py | 3 +- .../models/security_notification.py | 6 +- .../capif_security/models/service_security.py | 10 +-- .../capif_security/models/snssai.py | 6 +- .../models/websock_notif_config.py | 3 +- .../capif_security/test/__init__.py | 3 +- .../test/test_default_controller.py | 9 +-- .../capif_security/typing_utils.py | 1 - .../capif_security/util.py | 2 +- services/TS29222_CAPIF_Security_API/setup.py | 1 - services/helper/helper_service/app.py | 12 ++-- services/helper/helper_service/config.py | 4 +- .../controllers/helper_controller.py | 4 +- .../helper_service/core/helper_operations.py | 10 +-- services/helper/helper_service/db/db.py | 6 +- services/mock_server/mock_server.py | 5 +- services/register/register_service/app.py | 14 ++-- services/register/register_service/config.py | 4 +- .../controllers/register_controller.py | 12 ++-- .../core/register_operations.py | 13 ++-- services/register/register_service/db/db.py | 3 +- 478 files changed, 1021 insertions(+), 2235 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 0a543488..e44c08e4 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 @@ -1,26 +1,27 @@ #!/usr/bin/env python3 -import connexion import logging -import encoder -from flask_jwt_extended import JWTManager, jwt_required, create_access_token -from config import Config -from core.consumer_messager import Subscriber -from logging.handlers import RotatingFileHandler import os -from fluent import sender -from flask_executor import Executor -from flask_apscheduler import APScheduler from datetime import datetime -from opentelemetry.instrumentation.flask import FlaskInstrumentor +from logging.handlers import RotatingFileHandler + +import connexion +from flask_apscheduler import APScheduler +from flask_executor import Executor +from flask_jwt_extended import JWTManager +from fluent import sender from opentelemetry import trace -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +import encoder +from config import Config +from core.consumer_messager import Subscriber NAME = "Invoker-Service" diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py index 01f9914c..abfa4082 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 866dd32c..c080cd19 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 @@ -1,14 +1,13 @@ -import connexion - -from ..models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501 -from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations -from ..core.validate_user import ControlAccess +from functools import wraps -from flask import Response, request, current_app -from flask_jwt_extended import jwt_required, get_jwt_identity from cryptography import x509 from cryptography.hazmat.backends import default_backend -from functools import wraps +from flask import request, current_app +from flask_jwt_extended import jwt_required, get_jwt_identity + +from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations +from ..core.validate_user import ControlAccess +from ..models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501 invoker_operations = InvokerManagementOperations() valid_user = 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 6f1a05f4..9cce3a04 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,12 +1,4 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union - -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.problem_details import ProblemDetails # noqa: E501 -from api_invoker_management import util def modify_ind_api_invoke_enrolment(onboarding_id, api_invoker_enrolment_details_patch): # noqa: E501 diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + 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 af08e7ef..fcc1a188 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 @@ -1,20 +1,22 @@ -import rfc3987 -from pymongo import ReturnDocument +import json +import os import secrets +from datetime import datetime + import requests -from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response +import rfc3987 +from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails from flask import current_app, Response -import json -from datetime import datetime -from ..util import dict_to_camel_case, serialize_clean_camel_case +from pymongo import ReturnDocument + from .auth_manager import AuthManager -from .resources import Resource -from ..config import Config -from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails +from .publisher import Publisher from .redis_event import RedisEvent from .redis_internal_event import RedisInternalEvent -from .publisher import Publisher -import os +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 publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py index c3736a6d..4614d64f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py @@ -1,5 +1,6 @@ from cryptography import x509 from cryptography.hazmat.backends import default_backend + from .resources import Resource diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py index d82ab139..f6243656 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py @@ -1,8 +1,10 @@ # subscriber.py +import json + import redis -from .invoker_internal_ops import InvokerInternalOperations from flask import current_app -import json + +from .invoker_internal_ops import InvokerInternalOperations class Subscriber(): 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 e9de5ab2..f80e6b2e 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,8 @@ -from ..encoder import JSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import JSONEncoder + 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 faa5ea12..50e34342 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,8 @@ -from ..encoder import JSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import JSONEncoder + publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py index ef58351b..7ef0e6f2 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py @@ -1,6 +1,8 @@ -from abc import ABC, abstractmethod +from abc import ABC + from api_invoker_management.db.db import MongoDatabse + class Resource(ABC): def __init__(self): diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py index 4fb2261b..8f975cbf 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py @@ -1,7 +1,9 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder -from flask import Response import json + +from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case mimetype = "application/json" 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 69760cf3..1b25fd6a 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,9 +1,11 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + 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 diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py index 89c8a48f..92bf7d6d 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect + from api_invoker_management.config import Config from bson.codec_options import CodecOptions -import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py index bbf091b0..9c06b11b 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py @@ -1,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from api_invoker_management.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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 2c0f16e2..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,48 +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.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..c5b5a7d0 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 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 ea2ec90c..2556c6ec 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,19 +1,9 @@ from datetime import date, datetime # 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.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 @@ -22,6 +12,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 fdfef7e3..c29d5515 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 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..55e0255e 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 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..43fccbbe 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 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..6d199dea 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 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..5c09caf9 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 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..84d3489a 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 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..f9e7771f 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 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..ecd02ac5 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 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..7be7c612 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..74c27870 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 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..02477e5d 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,31 +1,13 @@ from datetime import date, datetime # 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.ellipsoid_arc import EllipsoidArc # noqa: E501 +from api_invoker_management.models.base_model import Model from api_invoker_management.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from api_invoker_management.models.point import Point # noqa: E501 -from api_invoker_management.models.point_altitude import PointAltitude # noqa: E501 -from api_invoker_management.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from api_invoker_management.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from api_invoker_management.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -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..c10a7c64 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 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 8f24ab28..1c4e7192 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from api_invoker_management.models.base_model import Model -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.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..60f94e86 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 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..7a8a4bf5 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 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 fbe1a245..eb609084 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 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..d12cb20c 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 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..46203297 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 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..50a6d460 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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 80e6b6b9..7c8633fc 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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 e5336832..1313b683 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from api_invoker_management.models.base_model import Model -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.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/onboarding_information.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py index 8b5f6ea8..b4a93bb7 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 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..d7ec7e24 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 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..8ebd5c61 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 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..95ce36c2 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..4533b0cc 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..4708b9b0 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..89dd1c68 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..252f7be1 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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..9b1ea42a 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from api_invoker_management.models.base_model import Model 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 006c0f9b..bf1b6677 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 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..8322eb2c 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 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..76b6b93f 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 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..e5092005 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 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..1fd97b39 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 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..99a51a85 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 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 c5c75155..29659b82 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 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 f0f59bd1..9131233e 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 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..a6f19807 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 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..4d459b98 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 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..b7e74949 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 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..5d41877b 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 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..dfdc783c 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 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..2c38535d 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 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 058637b0..5724e7df 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,7 @@ 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..d0cece92 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,7 @@ 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.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/typing_utils.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py index ec810cbc..cc088050 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 @@ -1,8 +1,8 @@ import datetime -import typing 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 cbb93c78..7187d5c1 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "api_invoker_management" 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 95d2758f..0838c6b7 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 @@ -1,25 +1,23 @@ #!/usr/bin/env python3 -import connexion import logging -import api_provider_management.encoder +import os +from logging.handlers import RotatingFileHandler +import api_provider_management.encoder +import connexion from flask_jwt_extended import JWTManager -from logging.handlers import RotatingFileHandler -from .config import Config -import os -import sys from fluent import sender -from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry import trace -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor - +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from .config import Config NAME = "Provider-Service" diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py index bed212ac..404434fe 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 2fd6000e..6232ea29 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 @@ -1,20 +1,13 @@ -import connexion -from flask import Response, request, current_app +from functools import wraps -from ..core.provider_enrolment_details_api import ProviderManagementOperations 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 import util - -from ..core.validate_user import ControlAccess - 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 cryptography import x509 -from functools import wraps -import asyncio +from ..core.provider_enrolment_details_api import ProviderManagementOperations +from ..core.validate_user import ControlAccess provider_management_ops = ProviderManagementOperations() valid_user = 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 c7e454b1..abc75937 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,13 +1,7 @@ -import connexion -from flask import Response, request, current_app +from flask import request, current_app + from ..core.provider_enrolment_details_api import ProviderManagementOperations -from ..models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 from ..models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch # noqa: E501 -from ..models.problem_details import ProblemDetails # noqa: E501 -from .. import util - -from cryptography.hazmat.backends import default_backend -from cryptography import x509 provider_management_ops = ProviderManagementOperations() diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py index cfa302ad..4e5a6f10 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py @@ -1,6 +1,7 @@ from cryptography import x509 from cryptography.hazmat.backends import default_backend + from .resources import Resource 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 459361c6..9c964345 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 @@ -1,17 +1,18 @@ -from pymongo import ReturnDocument +import os import secrets -from flask import current_app, Flask, Response -from ..core.sign_certificate import sign_certificate -from .responses import internal_server_error, not_found_error, forbidden_error, make_response, bad_request_error from datetime import datetime -from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case -from .resources import Resource -from .auth_manager import AuthManager from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails # noqa: E501 +from flask import current_app, Response +from pymongo import ReturnDocument + +from .auth_manager import AuthManager from .redis_internal_event import RedisInternalEvent -import os +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 class ProviderManagementOperations(Resource): 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 faa5ea12..50e34342 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,8 @@ -from ..encoder import JSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import JSONEncoder + publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py index 7b8092ab..d2b8da87 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py @@ -1,6 +1,8 @@ from abc import ABC -from db.db import MongoDatabse + from core.publisher import Publisher +from db.db import MongoDatabse + class Resource(ABC): diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py index 7fd8fec4..8f975cbf 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py @@ -1,8 +1,10 @@ -from ..models.problem_details import ProblemDetails +import json + +from flask import Response + from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case -from flask import Response, current_app -import json mimetype = "application/json" diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py index 1e23a810..f535a6c8 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py @@ -1,7 +1,10 @@ -import requests import json + +import requests + from ..config import Config + def sign_certificate(publick_key, provider_id): config = Config().get_config() 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 624c5a92..153a90c7 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,9 +1,11 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + 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 diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py index 024529c6..e4957614 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py index 2f096e70..51082b27 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py @@ -1,5 +1,4 @@ from connexion.jsonifier import JSONEncoder -import six from .models.base_model import Model diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py index 5ad7c47a..d036df69 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py @@ -1,9 +1,2 @@ # flake8: noqa # import models into model package -from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails -from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch -from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails -from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole -from api_provider_management.models.invalid_param import InvalidParam -from api_provider_management.models.problem_details import ProblemDetails -from api_provider_management.models.registration_information import RegistrationInformation 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 3199537f..92a63120 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 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..a9eeeceb 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 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..20cc6f7e 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 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..2646b418 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 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..6d1bfc15 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 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 6ce7d77b..89e0807f 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 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..5255ef8c 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 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..87052d95 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,7 @@ 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..6d8533af 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,7 @@ 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.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/api_provider_management/typing_utils.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py index f533c8d8..e882f92f 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py @@ -1,8 +1,8 @@ import datetime -import typing from api_provider_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_Provider_Management_API/setup.py b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py index 9eba8bdd..0f5d4a62 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/setup.py +++ b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "api_provider_management" 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 183c081e..0b39d964 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 @@ -1,28 +1,27 @@ #!/usr/bin/env python3 -import connexion - -import encoder - import logging - -from flask_jwt_extended import JWTManager, jwt_required, create_access_token -from logging.handlers import RotatingFileHandler -from config import Config -from datetime import datetime import os -from fluent import sender -from core.consumer_messager import Subscriber -from flask_executor import Executor +from datetime import datetime +from logging.handlers import RotatingFileHandler + +import connexion from flask_apscheduler import APScheduler -from opentelemetry.instrumentation.flask import FlaskInstrumentor +from flask_executor import Executor +from flask_jwt_extended import JWTManager +from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator + +import encoder +from config import Config +from core.consumer_messager import Subscriber NAME = "Acl-Service" diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/config.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/config.py index 01f9914c..abfa4082 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/config.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 bb5a8ee6..bf9857c6 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 @@ -1,19 +1,12 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union - -from capif_acl.models.access_control_policy_list import AccessControlPolicyList # noqa: E501 -from capif_acl.models.problem_details import ProblemDetails # noqa: E501 -from capif_acl import util - from functools import wraps -from flask import request, current_app + from cryptography import x509 from cryptography.hazmat.backends import default_backend +from flask import request, current_app from ..core.accesscontrolpolicyapi import accessControlPolicyApi + def cert_validation(): def _cert_validation(f): @wraps(f) 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..139597f9 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,2 @@ -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 48bf04e6..27e7f248 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,8 +1,9 @@ -from ..core.resources import Resource 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 dict_to_camel_case, clean_empty, serialize_clean_camel_case +from ..util import serialize_clean_camel_case class accessControlPolicyApi(Resource): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/consumer_messager.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/consumer_messager.py index 44378a63..141b1604 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/consumer_messager.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/consumer_messager.py @@ -1,9 +1,11 @@ # subscriber.py +import json + import redis from config import Config -from .internal_service_ops import InternalServiceOps from flask import current_app -import json + +from .internal_service_ops import InternalServiceOps class Subscriber(): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py index 63f75f28..520f35c1 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py @@ -1,12 +1,13 @@ +from datetime import datetime, timedelta + from flask import current_app -from .resources import Resource from models.api_invoker_policy import ApiInvokerPolicy from models.time_range_list import TimeRangeList -from datetime import datetime, timedelta +from util import dict_to_camel_case from .redis_event import RedisEvent -from util import dict_to_camel_case, clean_empty +from .resources import Resource class InternalServiceOps(Resource): diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/redis_event.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/redis_event.py index 1217b219..77526edb 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/redis_event.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/redis_event.py @@ -1,6 +1,8 @@ +import json + from encoder import CustomJSONEncoder + from .publisher import Publisher -import json publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/resources.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/resources.py index d5a3552d..053c1078 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/resources.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/resources.py @@ -1,4 +1,5 @@ from abc import ABC + from db.db import MongoDatabse diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/responses.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/responses.py index 49544126..8f975cbf 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/responses.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/responses.py @@ -1,9 +1,11 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder -from flask import Response -from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case import json +from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails +from ..util import serialize_clean_camel_case + mimetype = "application/json" diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/db/db.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/db/db.py index e485c892..66a40609 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/db/db.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/db/db.py @@ -1,11 +1,12 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/encoder.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/encoder.py index 1a2eff60..9afbbe1d 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/encoder.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/encoder.py @@ -1,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from capif_acl.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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..03850940 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 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..1798a003 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 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..cd2c0864 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 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 ec494ca7..99610c5a 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 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..5585278a 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 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/capif_acl/test/test_default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/test_default_controller.py index d2f9a54a..f7ba5cee 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/test/test_default_controller.py @@ -1,9 +1,5 @@ import unittest -from flask import json - -from capif_acl.models.access_control_policy_list import AccessControlPolicyList # noqa: E501 -from capif_acl.models.problem_details import ProblemDetails # noqa: E501 from capif_acl.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/util.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/util.py index 110348b3..252dc18e 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/util.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/util.py @@ -1,8 +1,8 @@ import datetime -import typing from capif_acl import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py index 78262fd2..d4234b02 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "capif_acl" diff --git a/services/TS29222_CAPIF_Auditing_API/logs/app.py b/services/TS29222_CAPIF_Auditing_API/logs/app.py index 28b267e0..4e8068e7 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/app.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/app.py @@ -1,20 +1,21 @@ #!/usr/bin/env python3 -import connexion import logging -from logging.handlers import RotatingFileHandler -import encoder -from config import Config import os +from logging.handlers import RotatingFileHandler + +import connexion from fluent import sender -from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry.sdk.resources import Resource 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" diff --git a/services/TS29222_CAPIF_Auditing_API/logs/config.py b/services/TS29222_CAPIF_Auditing_API/logs/config.py index 97ab831f..2ac31772 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/config.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 6e0180e0..87ecabbf 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py @@ -1,19 +1,10 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union - +from flask import request, current_app +from logs import util from logs.models.interface_description import InterfaceDescription # noqa: E501 -from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes # noqa: E501 from logs.models.operation import Operation # noqa: E501 -from logs.models.problem_details import ProblemDetails # noqa: E501 from logs.models.protocol import Protocol # noqa: E501 -from logs import util -from ..util import deserialize_datetime from ..core.auditoperations import AuditOperations -from flask import Response, request, current_app - from ..core.responses import bad_request_error audit_operations = AuditOperations() diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py index f74ec112..86586ed2 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py @@ -1,12 +1,12 @@ -from flask import current_app, Flask, Response import json -from .resources import Resource +from flask import current_app -from ..util import serialize_clean_camel_case -from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response +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 class AuditOperations (Resource): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py b/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py index d5a3552d..053c1078 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py @@ -1,4 +1,5 @@ from abc import ABC + from db.db import MongoDatabse diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py b/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py index 62874058..8f975cbf 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py @@ -1,8 +1,10 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder +import json + from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case -import json mimetype = "application/json" diff --git a/services/TS29222_CAPIF_Auditing_API/logs/db/db.py b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py index cf7c0d2c..4520c846 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/db/db.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect + from config import Config -import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py index b2bd64d4..a6803052 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 -import six 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 7669fe9a..d036df69 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py @@ -1,12 +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.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 952fa9da..f4700962 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py @@ -1,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from logs.models.base_model import Model -from logs.models.security_method import SecurityMethod -import re from logs import util - +from logs.models.base_model import Model 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..a7c83e71 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 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 11405773..f5d5e0ec 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 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 e56e9c1e..a4fe7ca4 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 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 f25c77c3..b26a62f2 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,12 @@ +import re # noqa: E501 from datetime import date, datetime # 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..2fb185c6 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 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/operation.py b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py index a8efafdc..d36a4e88 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 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 cae1546a..beca8ffd 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 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..db5cdc90 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 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..db5311a1 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 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..3223c999 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,12 +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 -from logs.models.problem_details import ProblemDetails # noqa: E501 -from logs.models.protocol import Protocol # noqa: E501 from logs.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Auditing_API/logs/util.py b/services/TS29222_CAPIF_Auditing_API/logs/util.py index 16287a2b..54d6f33b 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/util.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/util.py @@ -1,8 +1,8 @@ import datetime -import typing from logs import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_Auditing_API/setup.py b/services/TS29222_CAPIF_Auditing_API/setup.py index fe867a58..c593a412 100644 --- a/services/TS29222_CAPIF_Auditing_API/setup.py +++ b/services/TS29222_CAPIF_Auditing_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "logs" 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 38988fd0..4084bfdb 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/app.py @@ -1,24 +1,23 @@ #!/usr/bin/env python3 -import connexion - -import encoder - import logging -from flask_jwt_extended import JWTManager, jwt_required, create_access_token +import os from logging.handlers import RotatingFileHandler -from config import Config -import os +import connexion +from flask_jwt_extended import JWTManager from fluent import sender -from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator + +import encoder +from config import Config NAME = "Discover-Service" diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py index 97ab831f..2ac31772 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 e6b41b08..2ce066ee 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,20 +1,11 @@ -from typing import Dict -from typing import Tuple -from typing import Union +from service_apis.models.discovered_apis import DiscoveredAPIs # noqa: E501 + +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 +from flask import request, current_app from service_apis.models.discovered_apis import DiscoveredAPIs # noqa: E501 -from service_apis.models.ip_addr_info import IpAddrInfo # noqa: E501 -from service_apis.models.problem_details import ProblemDetails # noqa: E501 -from service_apis.models.protocol import Protocol # noqa: E501 -from service_apis.models.service_kpis import ServiceKpis # noqa: E501 -from service_apis import util from ..core.discoveredapis import DiscoverApisOperations -from flask import Response, request, current_app -import json discover_apis = DiscoverApisOperations() diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + 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 58c88c83..f4b0d8fd 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 @@ -1,11 +1,14 @@ -from flask import current_app, Flask, Response -from ..core.responses import internal_server_error, forbidden_error ,make_response, not_found_error +import json + +from flask import current_app + +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 ..core.resources import Resource -import json -from ..vendor_specific import find_attribute_in_body, filter_apis_with_vendor_specific_params, remove_vendor_specific_fields +from ..vendor_specific import find_attribute_in_body, filter_apis_with_vendor_specific_params, \ + remove_vendor_specific_fields def filter_fields(filtered_apis): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py index efbe3c2d..053c1078 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py @@ -1,6 +1,8 @@ -from abc import ABC, abstractmethod +from abc import ABC + from db.db import MongoDatabse + class Resource(ABC): def __init__(self): diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py index 8836f998..0aafcc67 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py @@ -1,8 +1,10 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder +import json + from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case -import json mimetype = "application/json" diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py index fb741fbf..39b1889d 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": 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 8f657c6c..c741e68b 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 -import six 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 fcf63d51..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,44 +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.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..1174800e 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 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 f79d8eb3..4c1ce31d 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,19 +1,9 @@ from datetime import date, datetime # 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.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 @@ -22,6 +12,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..2cb1a216 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 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..5e8fb961 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 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..e6b697a1 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 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..7c93f551 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 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..9cbf6ff5 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 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 cce0ff8b..cce42aef 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,13 +1,11 @@ from datetime import date, datetime # 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 from service_apis import util - +from service_apis.models.base_model import Model from service_apis.models.service_api_description import ServiceAPIDescription # 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..98745d95 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..7e4f7c4a 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 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..bc7034d3 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,31 +1,13 @@ from datetime import date, datetime # 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.ellipsoid_arc import EllipsoidArc # noqa: E501 +from service_apis.models.base_model import Model from service_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from service_apis.models.point import Point # noqa: E501 -from service_apis.models.point_altitude import PointAltitude # noqa: E501 -from service_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from service_apis.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from service_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -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..c07d138f 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 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 69348cab..74bf6544 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from service_apis.models.base_model import Model -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.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..75965c05 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 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..3f40627b 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 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..7d19e339 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 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 17760c2e..a7e40ff6 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 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..b7af560a 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 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..841f7dad 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 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..1d99c36b 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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 60550687..4ab20c6b 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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 92fc9d55..f7e3fc58 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from service_apis.models.base_model import Model -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.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/operation.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py index 6e0b387e..db7461ed 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 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..4dd203f4 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..c692296e 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..8cb287ae 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..aa0d9101 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..498296e3 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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..e8c152b2 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from service_apis.models.base_model import Model 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 f4454d1e..371d6452 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 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..bd8783f2 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 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..5135c5a7 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 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..b40cde6b 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 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..6e0a6c35 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 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..62ebc962 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 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 6e68ec4f..339b35c6 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 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 78b52ece..b8024ec9 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 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..6970e3da 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 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..2f2a6aea 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 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..0250ace1 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 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..07792596 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 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..3e4f6efa 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 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 5a97a4cd..3d4afdbc 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,15 +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 -from service_apis.models.discovered_apis import DiscoveredAPIs # noqa: E501 -from service_apis.models.ip_addr_info import IpAddrInfo # noqa: E501 -from service_apis.models.problem_details import ProblemDetails # noqa: E501 -from service_apis.models.protocol import Protocol # noqa: E501 -from service_apis.models.service_kpis import ServiceKpis # noqa: E501 from service_apis.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py index 88a422c7..58101ea1 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py +++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py @@ -1,6 +1,5 @@ import datetime -import typing from service_apis import typing_utils diff --git a/services/TS29222_CAPIF_Discover_Service_API/setup.py b/services/TS29222_CAPIF_Discover_Service_API/setup.py index a2de7b19..3594e776 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/setup.py +++ b/services/TS29222_CAPIF_Discover_Service_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "service_apis" diff --git a/services/TS29222_CAPIF_Events_API/capif_events/app.py b/services/TS29222_CAPIF_Events_API/capif_events/app.py index d21ee573..ef1d8c3a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/app.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/app.py @@ -1,37 +1,28 @@ #!/usr/bin/env python3 -import connexion -import sys import logging - -import encoder - - -from flask import Flask, jsonify, request -from flask_jwt_extended import JWTManager, jwt_required, create_access_token -from pymongo import MongoClient - -from core.notifications import Notifications -from core.consumer_messager import Subscriber -from multiprocessing import Process -from threading import Thread -from flask_executor import Executor -from flask_apscheduler import APScheduler +import os from datetime import datetime from logging.handlers import RotatingFileHandler -from config import Config -import os -from fluent import sender + +import connexion +from flask_apscheduler import APScheduler from flask_executor import Executor -from opentelemetry.instrumentation.flask import FlaskInstrumentor +from flask_jwt_extended import JWTManager +from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +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" diff --git a/services/TS29222_CAPIF_Events_API/capif_events/config.py b/services/TS29222_CAPIF_Events_API/capif_events/config.py index bed212ac..404434fe 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/config.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 bdf9177a..2e071c8b 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 @@ -1,23 +1,13 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union +from functools import wraps 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 import util - -from ..core.events_apis import EventSubscriptionsOperations -import json -from flask import Response, request, current_app -from flask_jwt_extended import jwt_required, get_jwt_identity -from ..models.problem_details import ProblemDetails from cryptography import x509 from cryptography.hazmat.backends import default_backend +from flask import request, current_app + +from ..core.events_apis import EventSubscriptionsOperations from ..core.validate_user import ControlAccess -from functools import wraps -import pymongo events_ops = EventSubscriptionsOperations() valid_user = ControlAccess() diff --git a/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller.py b/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py b/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py index 7a5fb82f..013889b0 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py @@ -1,7 +1,6 @@ from flask import current_app -from cryptography import x509 -from cryptography.hazmat.backends import default_backend + from .resources import Resource diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py b/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py index c3d095fb..902ea465 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py @@ -1,14 +1,12 @@ # subscriber.py -import redis -import time -import sys import json -import asyncio -from threading import Thread -from .notifications import Notifications -from .internal_event_ops import InternalEventOperations + +import redis from flask import current_app +from .internal_event_ops import InternalEventOperations +from .notifications import Notifications + class Subscriber(): 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 3555281a..57fe0c70 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 @@ -1,20 +1,14 @@ -import sys +import os +import secrets import rfc3987 -import pymongo -import secrets -import re -from flask import current_app, Flask, Response -import json -from ..models.problem_details import ProblemDetails from capif_events.models.event_subscription import EventSubscription # noqa: E501 +from flask import current_app, Response + +from .auth_manager import AuthManager from .resources import Resource -from bson import json_util from .responses import internal_server_error, not_found_error, make_response, bad_request_error -from ..db.db import MongoDatabse from ..util import serialize_clean_camel_case, clean_empty, dict_to_camel_case -from .auth_manager import AuthManager -import os class EventSubscriptionsOperations(Resource): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py b/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py index e49089a3..f9daf008 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py @@ -1,6 +1,8 @@ from flask import current_app -from .resources import Resource + from .auth_manager import AuthManager +from .resources import Resource + class InternalEventOperations(Resource): 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 9df3ad40..37aab4b3 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py @@ -1,19 +1,18 @@ #import concurrent +import asyncio +import json +import os + +import aiohttp import requests -from .internal_event_ops import InternalEventOperations -from models.event_notification import EventNotification -from models.access_control_policy_list_ext import AccessControlPolicyListExt -from models.capif_event_detail import CAPIFEventDetail -from models.event_subscription import EventSubscription -from models.service_api_description import ServiceAPIDescription from encoder import CustomJSONEncoder -import sys -import json from flask import current_app -import asyncio -import aiohttp -from util import dict_to_camel_case, clean_empty, serialize_clean_camel_case -import os +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 + class Notifications(): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py b/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py index efbe3c2d..053c1078 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py @@ -1,6 +1,8 @@ -from abc import ABC, abstractmethod +from abc import ABC + from db.db import MongoDatabse + class Resource(ABC): def __init__(self): diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py b/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py index 62874058..8f975cbf 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py @@ -1,8 +1,10 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder +import json + from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case -import json mimetype = "application/json" 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 937a1670..168e903f 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,9 +1,11 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + 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 diff --git a/services/TS29222_CAPIF_Events_API/capif_events/db/db.py b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py index 68391d88..adfc472a 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/db/db.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py @@ -1,11 +1,11 @@ -import atexit +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_Events_API/capif_events/encoder.py b/services/TS29222_CAPIF_Events_API/capif_events/encoder.py index 94e57f03..66b0c8c5 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/encoder.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/encoder.py @@ -1,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from capif_events.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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 5085357a..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,67 +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.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..95e986c1 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 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..2492b928 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 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..3487b6f3 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 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 331a7113..c59fc51f 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,19 +1,9 @@ from datetime import date, datetime # 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.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 @@ -22,6 +12,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..30c021c2 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 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..c088f5bd 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 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..4275f290 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 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..381df838 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 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..ebc44655 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 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..6db6dce0 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 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..34b6e912 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 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..93fb3275 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 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..57deea3b 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 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..751627ee 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 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..05a4ea3e 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..e59efbbc 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 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 e4cd8473..fef52865 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 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..401b92e5 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 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..568a10bf 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 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..69ee22da 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,31 +1,13 @@ from datetime import date, datetime # 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.ellipsoid_arc import EllipsoidArc # noqa: E501 +from capif_events.models.base_model import Model from capif_events.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from capif_events.models.point import Point # noqa: E501 -from capif_events.models.point_altitude import PointAltitude # noqa: E501 -from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -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..8337fc1b 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 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 d8cf6b72..42ddd5f0 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_events.models.base_model import Model -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.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..795b8890 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 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 c34c73bc..1762fbc7 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 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..f2b3d3b0 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 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 1e5f5c3e..a76dee21 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 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 2f8b4a5c..6773c80c 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 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..01cf6762 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 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..3d7e5c83 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 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..4eff20b6 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 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..588ecb63 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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 5ba95042..a70f1a00 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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 07ec5594..4cb83ca6 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_events.models.base_model import Model -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.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..5b9f5bb7 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 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..d8882bfb 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 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..902cf193 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 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..17eff44a 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 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..f8676038 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 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/operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py index 01c08428..1a8a1f97 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 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..40a8bf7b 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 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..3f9f2e23 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..64134eca 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..f45227d1 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..a62a475c 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..618bb46d 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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..7d89244d 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_events.models.base_model import Model 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 10e9114d..bbf92452 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 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..a92a428a 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 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..6f2ae662 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 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..e6c06126 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 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..cb2fcfe9 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 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..9ab8c771 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 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..0560f90f 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 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..fa70435c 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 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 3c562601..ac3bb242 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 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 6c84f1ad..1bbabf84 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 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..05210269 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 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..99f4aab2 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 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..e78e057a 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 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..ad689a13 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 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..7f56cc9f 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 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..c10203df 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 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..e1a4a1f2 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 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..5777e684 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 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..f1ceeb00 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 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..b724d9ae 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,7 @@ 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/capif_events/typing_utils.py b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Events_API/capif_events/util.py b/services/TS29222_CAPIF_Events_API/capif_events/util.py index d8f55b6e..eaf2d641 100644 --- a/services/TS29222_CAPIF_Events_API/capif_events/util.py +++ b/services/TS29222_CAPIF_Events_API/capif_events/util.py @@ -1,8 +1,8 @@ import datetime -import typing from capif_events import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_Events_API/setup.py b/services/TS29222_CAPIF_Events_API/setup.py index 22fbd803..defed2cc 100644 --- a/services/TS29222_CAPIF_Events_API/setup.py +++ b/services/TS29222_CAPIF_Events_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "capif_events" 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 873a8a82..eda5d2bc 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 @@ -1,20 +1,21 @@ #!/usr/bin/env python3 -import connexion import logging -from logging.handlers import RotatingFileHandler -import encoder -from config import Config import os +from logging.handlers import RotatingFileHandler + +import connexion from fluent import sender -from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor from opentelemetry.sdk.resources import Resource 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" diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py index 97ab831f..2ac31772 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 450c6bc1..6877196b 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,19 +1,12 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union +from api_invocation_logs.models.invocation_log import InvocationLog # noqa: E501 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 import util +from cryptography import x509 +from cryptography.hazmat.backends import default_backend +from flask import request, current_app from ..core.invocationlogs import LoggingInvocationOperations - -from flask import Response, request, current_app - from ..core.validate_user import ControlAccess -from cryptography import x509 -from cryptography.hazmat.backends import default_backend logging_invocation_operations = LoggingInvocationOperations() diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + 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 92f7c270..43106643 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 @@ -1,17 +1,16 @@ +import json import os - import secrets -from flask import current_app +from flask import current_app from pymongo import ReturnDocument -from ..util import serialize_clean_camel_case -from ..encoder import CustomJSONEncoder -from .resources import Resource -from .responses import internal_server_error, not_found_error, unauthorized_error, make_response from .redis_event import RedisEvent -import json +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 class LoggingInvocationOperations(Resource): diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/publisher.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/publisher.py index a15c0d90..3a94b2c4 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/publisher.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/publisher.py @@ -1,6 +1,5 @@ import redis -import sys -from flask import current_app + class Publisher(): 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 f179a455..c65a6a20 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,8 @@ -from ..encoder import CustomJSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import CustomJSONEncoder + publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py index d5a3552d..053c1078 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py @@ -1,4 +1,5 @@ from abc import ABC + from db.db import MongoDatabse diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py index cc83d0f4..1f0302f6 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py @@ -1,8 +1,10 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder +import json + from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case -import json mimetype = "application/json" 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 129d834a..c2bdf50f 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,9 +1,11 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + 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 diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py index 87cc3a65..1999a2da 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect + from config import Config -import os from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py index 0d4b2044..28d87693 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py @@ -1,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from api_invocation_logs.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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 fa9b0e58..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,10 +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.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 89a5d905..cffe68d5 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from api_invocation_logs.models.base_model import Model -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.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..cabf7c8a 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 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 ded1b791..2ecb4d63 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 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..657d6a72 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 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/operation.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py index 513f6d00..87835c09 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 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 57744179..0a10c19d 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 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..708e8bc4 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 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..fe2fcfe3 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 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 92ad8cf0..f5c22b45 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,7 @@ 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/api_invocation_logs/typing_utils.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py index f6fdbc5f..60492f23 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py @@ -1,6 +1,5 @@ import datetime -import typing from api_invocation_logs import typing_utils diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py index 9b7d55e2..2edd1f35 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "api_invocation_logs" 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 7504d0b7..6cddfc9e 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/app.py @@ -1,29 +1,28 @@ #!/usr/bin/env python3 -import connexion -import logging - -# from published_apis import encoder -import encoder - -from flask_jwt_extended import JWTManager, jwt_required, create_access_token -from config import Config +import logging +import os +from datetime import datetime from logging.handlers import RotatingFileHandler -from core.consumer_messager import Subscriber -import os -from fluent import sender -from flask_executor import Executor -from opentelemetry.instrumentation.flask import FlaskInstrumentor +import connexion from flask_apscheduler import APScheduler -from datetime import datetime +from flask_executor import Executor +from flask_jwt_extended import JWTManager +from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +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" diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py index 01f9914c..abfa4082 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 b5bed443..695b3ae2 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 @@ -1,15 +1,14 @@ -from ..core.serviceapidescriptions import PublishServiceOperations -from ..models.service_api_description import ServiceAPIDescription # noqa: E501 - -from flask import request, current_app +from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from ..core.validate_user import ControlAccess -from functools import wraps +from flask import request, current_app from published_apis.vendor_specific import vendor_specific_key_n_value, find_attribute_in_body -from ..core.responses import bad_request_error +from ..core.responses import bad_request_error +from ..core.serviceapidescriptions import PublishServiceOperations +from ..core.validate_user import ControlAccess +from ..models.service_api_description import ServiceAPIDescription # noqa: E501 service_operations = 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 96543cfb..0661991f 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 @@ -1,20 +1,12 @@ -import connexion -from typing import Dict -from typing import Tuple -from typing import Union - -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 -from published_apis import util +from functools import wraps from cryptography import x509 from cryptography.hazmat.backends import default_backend -from ..core.validate_user import ControlAccess -from functools import wraps - from flask import request, current_app +from published_apis.models.service_api_description_patch import ServiceAPIDescriptionPatch # noqa: E501 + from ..core.serviceapidescriptions import PublishServiceOperations +from ..core.validate_user import ControlAccess service_operations = PublishServiceOperations() valid_user = ControlAccess() 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..139597f9 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,2 @@ -from typing import List + diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py index cb2f0b93..d20daffd 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py @@ -1,5 +1,6 @@ from flask import current_app + from .resources import Resource diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py index 2d138025..3814c71b 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py @@ -1,8 +1,10 @@ # subscriber.py +import json + import redis -from .internal_service_ops import InternalServiceOps from flask import current_app -import json + +from .internal_service_ops import InternalServiceOps class Subscriber(): diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py index d90174bd..fa7bc67d 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py @@ -1,7 +1,9 @@ from flask import current_app -from .resources import Resource + from .auth_manager import AuthManager +from .resources import Resource + class InternalServiceOps(Resource): 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 e9de5ab2..f80e6b2e 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,8 @@ -from ..encoder import JSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import JSONEncoder + publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py index 641d4029..06735240 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py @@ -1,4 +1,5 @@ from abc import ABC + from db.db import MongoDatabse diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py index cc631b0e..1f0302f6 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py @@ -1,9 +1,10 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder -from flask import Response -from ..util import serialize_clean_camel_case import json +from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails +from ..util import serialize_clean_camel_case mimetype = "application/json" 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 1f3b5252..5092d6b6 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 @@ -1,19 +1,18 @@ -from pymongo import ReturnDocument +import os import secrets +from datetime import datetime + from flask import current_app +from pymongo import ReturnDocument -from .resources import Resource -from datetime import datetime -from ..util import dict_to_camel_case, clean_empty, clean_n_camel_case -from .responses import internal_server_error, forbidden_error, not_found_error, unauthorized_error, make_response from .auth_manager import AuthManager -from .redis_event import RedisEvent 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 from ..models.service_api_description import ServiceAPIDescription -import json -from ..encoder import CustomJSONEncoder +from ..util import dict_to_camel_case, clean_empty, clean_n_camel_case from ..vendor_specific import add_vend_spec_fields -import os 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 9d0c69ca..94fe1d4b 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,9 +1,11 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + 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 diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py index 3885c589..e31b74f6 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py @@ -1,10 +1,11 @@ +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": 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 b54e14b5..4d957655 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 -import six 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 df30219a..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,43 +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.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..40e90aa6 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 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 787470d3..8d8ae470 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,19 +1,9 @@ from datetime import date, datetime # 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.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 @@ -22,6 +12,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..14b0d36b 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 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..94b868be 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 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..d69e24ba 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 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..f99e4aed 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 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..b8892d62 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 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..550649e4 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..1bee0024 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 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..4c88245f 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,31 +1,13 @@ from datetime import date, datetime # 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.ellipsoid_arc import EllipsoidArc # noqa: E501 +from published_apis.models.base_model import Model from published_apis.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from published_apis.models.point import Point # noqa: E501 -from published_apis.models.point_altitude import PointAltitude # noqa: E501 -from published_apis.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from published_apis.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from published_apis.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -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..7ef6a2cd 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 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 9707c01b..dec95962 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from published_apis.models.base_model import Model -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.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..4dd00c7a 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 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..e4bffa1c 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 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 11c7e160..bfca85a7 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 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..082fbaf1 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 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..3270bfc5 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 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..777b98ed 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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 2589c0e3..728f69a9 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,14 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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 71ec7c07..82df6391 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from published_apis.models.base_model import Model -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.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/operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py index 0923ce76..c59a6702 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 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..433aa9e8 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..7bfb24ae 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..9bc6dbd5 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..7b15b671 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..13c8e1b7 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,13 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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..d4ce9418 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from published_apis.models.base_model import Model 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 252aaa7a..ac7c9ee9 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 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..dc6ae7eb 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 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..a76f56fa 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 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..35c9dbf5 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 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..6c8d09d8 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 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..01847e2b 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 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 945060fe..e50c9e01 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 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 d03a51fe..d812d30d 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 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 99b85dac..2d0b3c17 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 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..548e3753 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 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..7b5da399 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 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..7fc3e172 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 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..7a89fe96 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 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..a53e20f2 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 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 c64cf271..7f824b92 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,9 +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..76ef0795 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,10 +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 from published_apis.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py index 2c8814f5..38d161b6 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py +++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py @@ -1,8 +1,8 @@ import datetime -import typing from published_apis import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_Publish_Service_API/setup.py b/services/TS29222_CAPIF_Publish_Service_API/setup.py index 5ae15b44..8b1c9912 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/setup.py +++ b/services/TS29222_CAPIF_Publish_Service_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "published_apis" 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 8a81b617..48e8769b 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,8 +1,8 @@ #!/usr/bin/env python3 import connexion -import encoder +import encoder app = connexion.App(__name__, specification_dir='openapi/') app.app.json_encoder = encoder.CustomJSONEncoder 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 58b9b0c4..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,42 +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.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..f0e756be 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 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 b5dd194a..ccf24ad6 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,19 +1,9 @@ from datetime import date, datetime # 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.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 @@ -22,6 +12,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..e12616c9 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 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..02f3063d 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 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..6ea6b705 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 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..3b453d17 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 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..790d70a0 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.base_model import Model 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..de287476 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 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..f0fd6607 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,31 +1,13 @@ from datetime import date, datetime # 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.ellipsoid_arc import EllipsoidArc # noqa: E501 +from capif_routing_info.models.base_model import Model from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from capif_routing_info.models.point import Point # noqa: E501 -from capif_routing_info.models.point_altitude import PointAltitude # noqa: E501 -from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -from capif_routing_info.models.polygon import Polygon # noqa: E501 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 + class GeographicArea(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py index 00e9589b..6d0075be 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_routing_info.models.base_model import Model -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.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..3014346f 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 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..6fa0acf3 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 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 b50e0b2e..a8025b6c 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 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 39fa467a..ebb34a4a 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 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..a0805802 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 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..2067eb2d 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 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..270b9ac9 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 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/local_origin.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py index 45fc9828..8eb4a75a 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,13 +1,11 @@ from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_routing_info.models.base_model import Model -from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates from capif_routing_info import util - +from capif_routing_info.models.base_model import Model from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 + class LocalOrigin(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py index 856dc775..3e0511a1 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 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..471c405c 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.base_model import Model 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..8524f902 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.base_model import Model 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/polygon.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py index 3af36a1e..977b0226 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,12 @@ from datetime import date, datetime # 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.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.base_model import Model 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 3fc488d0..e2a91365 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 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..48cda2a8 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 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/resource.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py index c6540878..11872f49 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 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..e81e9048 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 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..14216c31 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 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..dc073f40 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 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 4c07b02c..05926a00 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 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..98407a0e 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 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..9d802dd4 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 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/version.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py index 1be123dc..6e7df341 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 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..e90ce923 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,9 +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/setup.py b/services/TS29222_CAPIF_Routing_Info_API/setup.py index 23f473e8..6d66c726 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/setup.py +++ b/services/TS29222_CAPIF_Routing_Info_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "capif_routing_info" diff --git a/services/TS29222_CAPIF_Security_API/capif_security/app.py b/services/TS29222_CAPIF_Security_API/capif_security/app.py index 08ec6419..c61896ee 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/app.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/app.py @@ -1,25 +1,27 @@ #!/usr/bin/env python3 -import connexion import logging -import encoder -from flask_jwt_extended import JWTManager -from config import Config -from core.consumer_messager import Subscriber -from flask_apscheduler import APScheduler +import os from datetime import datetime from logging.handlers import RotatingFileHandler -import os -from fluent import sender + +import connexion +from flask_apscheduler import APScheduler from flask_executor import Executor -from opentelemetry.instrumentation.flask import FlaskInstrumentor +from flask_jwt_extended import JWTManager +from fluent import sender from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator +from opentelemetry.instrumentation.flask import FlaskInstrumentor +from opentelemetry.instrumentation.redis import RedisInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor -from opentelemetry.instrumentation.redis import RedisInstrumentor +from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator + +import encoder +from config import Config +from core.consumer_messager import Subscriber NAME = "Security-Service" diff --git a/services/TS29222_CAPIF_Security_API/capif_security/config.py b/services/TS29222_CAPIF_Security_API/capif_security/config.py index 01f9914c..abfa4082 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/config.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): 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 eec268a6..3609bd8f 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py @@ -1,19 +1,16 @@ +from functools import wraps + 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 cryptography import x509 from cryptography.hazmat.backends import default_backend -from ..core.validate_user import ControlAccess -from functools import wraps - -from ..core.publisher import Publisher - -from ..core.servicesecurity import SecurityOperations - from flask import request, current_app +from ..core.publisher import Publisher from ..core.redis_internal_event import RedisInternalEvent +from ..core.servicesecurity import SecurityOperations +from ..core.validate_user import ControlAccess service_security_ops = SecurityOperations() publish_ops = Publisher() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller.py index 6d294ffd..139597f9 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller.py @@ -1,2 +1,2 @@ -from typing import List + diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py b/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py index 5a90b3ee..a526bfbb 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py @@ -1,8 +1,10 @@ # subscriber.py +import json + import redis -from .internal_security_ops import InternalSecurityOps from flask import current_app -import json + +from .internal_security_ops import InternalSecurityOps class Subscriber(): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py index 795dd0be..16618da5 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py @@ -1,6 +1,7 @@ -import requests import os +import requests + class Notifications(): 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 f179a455..c65a6a20 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,8 @@ -from ..encoder import CustomJSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import CustomJSONEncoder + 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 faa5ea12..50e34342 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,8 @@ -from ..encoder import JSONEncoder -from .publisher import Publisher import json +from .publisher import Publisher +from ..encoder import JSONEncoder + publisher_ops = Publisher() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py b/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py index 53a35e5d..e507c21c 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py @@ -1,5 +1,7 @@ from abc import ABC + from db.db import MongoDatabse + from .notification import Notifications diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py b/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py index 6f204182..849e7f86 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py @@ -1,7 +1,9 @@ -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder -from flask import Response import json + +from flask import Response + +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails from ..util import serialize_clean_camel_case mimetype = "application/json" 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 e0304577..916b2861 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py @@ -1,22 +1,22 @@ -from pymongo import ReturnDocument +import json +import os +from datetime import datetime, timedelta import rfc3987 +from bson import json_util from flask import current_app from flask_jwt_extended import create_access_token -from datetime import datetime, timedelta -import json +from pymongo import ReturnDocument -from bson import json_util +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 ..models.access_token_claims import AccessTokenClaims from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case -from .responses import not_found_error, make_response, bad_request_error, internal_server_error, forbidden_error -from .resources import Resource -from .redis_event import RedisEvent -import os 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 10986442..c3f70049 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,9 +1,12 @@ -from flask import current_app, Response import json -from ..models.problem_details import ProblemDetails -from ..encoder import CustomJSONEncoder + +from flask import current_app, Response + from .resources import Resource -from .responses import internal_server_error,serialize_clean_camel_case +from .responses import internal_server_error, serialize_clean_camel_case +from ..encoder import CustomJSONEncoder +from ..models.problem_details import ProblemDetails + class ControlAccess(Resource): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/db/db.py b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py index 47a9538c..b2521d67 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/db/db.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py @@ -1,11 +1,11 @@ -import atexit +import os import time -from pymongo import MongoClient -from pymongo.errors import AutoReconnect -from config import Config + from bson.codec_options import CodecOptions -import os +from config import Config from opentelemetry.instrumentation.pymongo import PymongoInstrumentor +from pymongo import MongoClient +from pymongo.errors import AutoReconnect monitoring_value = os.environ.get("MONITORING", "").lower() if monitoring_value == "true": diff --git a/services/TS29222_CAPIF_Security_API/capif_security/encoder.py b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py index bb8a0c78..099bd1f8 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/encoder.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py @@ -1,7 +1,5 @@ -from connexion.jsonifier import JSONEncoder -import six - from capif_security.models.base_model import Model +from connexion.jsonifier import JSONEncoder class CustomJSONEncoder(JSONEncoder): 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 475e67aa..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,28 +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.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.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..71d49c28 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 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..b5d7f6f8 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 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..325b2197 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 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 47e4a30f..b9e4ff40 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,20 +1,14 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_security.models.base_model import Model -from capif_security.models.nf_type import NFType -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.nf_type import NFType # 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..deaf22ec 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 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..1b57bf4d 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 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 0031775f..47458b7b 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,14 +1,11 @@ +import re # noqa: E501 from datetime import date, datetime # noqa: F401 - from typing import List, Dict # noqa: F401 -from capif_security.models.base_model import Model -from capif_security.models.security_method import SecurityMethod -import re from capif_security import util - +from capif_security.models.base_model import Model 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..ca4a094e 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 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..3546df8d 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 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/nf_type.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py index 184a7c0d..0f2e09b2 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 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..c374ddeb 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 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..511afb65 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 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/o_auth_grant_type.py b/services/TS29222_CAPIF_Security_API/capif_security/models/o_auth_grant_type.py index 8bace2b9..9420cc5b 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 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 b7b42ecb..82696e45 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 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 16fd95e1..eb9d1e25 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 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 27a57776..50003d8e 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 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 8de2911c..777afe0d 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 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..962b251c 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 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..b5d0a01d 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 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 d7b9c67e..d59b5a48 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 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..e678a362 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 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..1d5bfae9 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 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..90e4e803 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 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 060c45aa..7556c8e7 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 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 72ae4c48..557c4bde 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 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..b72b264f 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 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 edb68b3d..0fbd10e6 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,14 +1,7 @@ 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 -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/capif_security/typing_utils.py b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py index 74e3c913..d21c4f63 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py @@ -1,7 +1,6 @@ import sys if sys.version_info < (3, 7): - import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Security_API/capif_security/util.py b/services/TS29222_CAPIF_Security_API/capif_security/util.py index 97d93c99..eb174c2e 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/util.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/util.py @@ -1,8 +1,8 @@ import datetime -import typing from capif_security import typing_utils + def serialize_clean_camel_case(obj): res = obj.to_dict() res = clean_empty(res) diff --git a/services/TS29222_CAPIF_Security_API/setup.py b/services/TS29222_CAPIF_Security_API/setup.py index 9653f405..fc9b23b7 100644 --- a/services/TS29222_CAPIF_Security_API/setup.py +++ b/services/TS29222_CAPIF_Security_API/setup.py @@ -1,4 +1,3 @@ -import sys from setuptools import setup, find_packages NAME = "capif_security" diff --git a/services/helper/helper_service/app.py b/services/helper/helper_service/app.py index e7a65ec2..3f9ae5c1 100644 --- a/services/helper/helper_service/app.py +++ b/services/helper/helper_service/app.py @@ -1,11 +1,13 @@ -from flask import Flask +import json import logging -from controllers.helper_controller import helper_routes +import os + +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 -import json -import requests -import os +from controllers.helper_controller import helper_routes app = Flask(__name__) config = Config().get_config() diff --git a/services/helper/helper_service/config.py b/services/helper/helper_service/config.py index f9574a67..d9f4ad1c 100644 --- a/services/helper/helper_service/config.py +++ b/services/helper/helper_service/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): diff --git a/services/helper/helper_service/controllers/helper_controller.py b/services/helper/helper_service/controllers/helper_controller.py index f645a564..03d276b7 100644 --- a/services/helper/helper_service/controllers/helper_controller.py +++ b/services/helper/helper_service/controllers/helper_controller.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from flask import Blueprint, request, current_app, jsonify -from core.helper_operations import HelperOperations from config import Config +from core.helper_operations import HelperOperations +from flask import Blueprint, request, current_app, jsonify 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 9e635467..d8a49c01 100644 --- a/services/helper/helper_service/core/helper_operations.py +++ b/services/helper/helper_service/core/helper_operations.py @@ -1,9 +1,11 @@ -from flask import jsonify, current_app +import os + import pymongo -from db.db import MongoDatabse -from config import Config import requests -import os +from config import Config +from db.db import MongoDatabse +from flask import jsonify, current_app + class HelperOperations: diff --git a/services/helper/helper_service/db/db.py b/services/helper/helper_service/db/db.py index bb2853ef..57b9b72e 100644 --- a/services/helper/helper_service/db/db.py +++ b/services/helper/helper_service/db/db.py @@ -1,8 +1,10 @@ import time + +from bson.codec_options import CodecOptions +from config import Config from pymongo import MongoClient from pymongo.errors import AutoReconnect -from config import Config -from bson.codec_options import CodecOptions + class MongoDatabse(): diff --git a/services/mock_server/mock_server.py b/services/mock_server/mock_server.py index a07c5ef6..5e15d4da 100644 --- a/services/mock_server/mock_server.py +++ b/services/mock_server/mock_server.py @@ -1,7 +1,8 @@ -from flask import Flask, request import logging -from logging.handlers import RotatingFileHandler import os +from logging.handlers import RotatingFileHandler + +from flask import Flask, request app = Flask(__name__) diff --git a/services/register/register_service/app.py b/services/register/register_service/app.py index 53d4b050..5e9c9a45 100644 --- a/services/register/register_service/app.py +++ b/services/register/register_service/app.py @@ -1,14 +1,16 @@ +import json +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 controllers.register_controller import register_routes from flask_jwt_extended import JWTManager -from OpenSSL.crypto import PKey, TYPE_RSA, X509Req, dump_certificate_request, FILETYPE_PEM, dump_privatekey -import requests -import json + from config import Config +from controllers.register_controller import register_routes from db.db import MongoDatabse -import logging -import os app = Flask(__name__) diff --git a/services/register/register_service/config.py b/services/register/register_service/config.py index 97ab831f..2ac31772 100644 --- a/services/register/register_service/config.py +++ b/services/register/register_service/config.py @@ -1,6 +1,8 @@ -import yaml import os +import yaml + + #Config class to get config class Config: def __init__(self): diff --git a/services/register/register_service/controllers/register_controller.py b/services/register/register_service/controllers/register_controller.py index a82998fb..ff3a5618 100644 --- a/services/register/register_service/controllers/register_controller.py +++ b/services/register/register_service/controllers/register_controller.py @@ -1,16 +1,14 @@ #!/usr/bin/env python3 -from flask import current_app, Flask, jsonify, request, Blueprint +from datetime import datetime, timedelta +from functools import wraps -from core.register_operations import RegisterOperations +import jwt from config import Config - -from functools import wraps -from datetime import datetime, timedelta +from core.register_operations import RegisterOperations from db.db import MongoDatabse - +from flask import current_app, jsonify, request, Blueprint from flask_httpauth import HTTPBasicAuth -import jwt auth = HTTPBasicAuth() diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index 10850ab3..7fa99ec6 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -1,11 +1,12 @@ -from flask import jsonify, current_app -from flask_jwt_extended import create_access_token -from db.db import MongoDatabse +import os +import uuid from datetime import datetime -from config import Config + import requests -import uuid -import os +from config import Config +from db.db import MongoDatabse +from flask import jsonify, current_app +from flask_jwt_extended import create_access_token class RegisterOperations: diff --git a/services/register/register_service/db/db.py b/services/register/register_service/db/db.py index fdf448e5..e1db51bd 100644 --- a/services/register/register_service/db/db.py +++ b/services/register/register_service/db/db.py @@ -1,7 +1,8 @@ import time + +from config import Config from pymongo import MongoClient from pymongo.errors import AutoReconnect -from config import Config class MongoDatabse(): -- GitLab