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 0a5434889cda682a7848c8a29e24fe662c6ca62d..e44c08e4776684adbfc29617e7cb261c7a2434fb 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 01f9914cc141eb3c49fd73506e9b1c5470edd781..abfa40820dc99bf2c64c7bf0a31994eedc414e03 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 866dd32cf7e3c0f9d5978d838f18fb1d3a12c9c4..c080cd19675cf0f0ee67e7bbdeec4ca7c57d8a70 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 6f1a05f4df21135200e97c2b0359ea58b7e06542..9cce3a04fe77786a839cab01f8389533d38c37e8 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 af08e7efb4aa8fb1f3f54a667f67dc13d819606b..fcc1a1883a7ea843d2a85166a900724a9b6c6310 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 c3736a6d4e2e95d58ab6a96c1e62fe42404538f1..4614d64febc873684f9326b77b3a71307d23c9e8 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 d82ab13945f05cf79cdf82f4da46b63740806907..f6243656cc59f0269d8ab042a12cc1fec0df0f35 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 e9de5ab2d9a73ccca2331301f6b8862f45822be6..f80e6b2e666574188740a99a0da0837ea899e01d 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 faa5ea12cb985b96b3cf8dfb7aaba6136b39e01e..50e343424b8498d32078648978c719c923304353 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 ef58351b43b89384564154cd65c824a2ea7d92a1..7ef0e6f20356e7712fced07b4c763bdea082d90d 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 4fb2261b4aca9e4dfe4bf0631b208db933f08dd1..8f975cbf426c304c4ae0681f65af67fcad9abca5 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 69760cf37a40aeb060e88c7ae1bc621b5509934c..1b25fd6a4cd6f01a50401fcd62dd42965631d267 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 89c8a48f76e37ce182faddf6b829eb60cf768eb3..92bf7d6d2fb4728a53ff6d6e799c20797cb6ac04 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 bbf091b0f0dd83f0526e54aa69ce1e54eeaf6042..9c06b11ba88238ed068af23376ddf006758a87b5 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 2c0f16e24ed2d1503c66bcca8c7f466872b68988..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 226cef2ca76d67ae37074e3a5c0a7598499f151e..c5b5a7d07ea7e2ef876d97837749a627c29d2890 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 ea2ec90ce46c2f8758392dc8fd19b81fc3e73fd0..2556c6ecfde9e6f6f5e45790967acc3541a2abc7 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 fdfef7e3168614217e8e99770c4597a7b377eb80..c29d55155cb3360795ac59ca0328b52736856503 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 0ac660c778cd1273933f57fa8550d3a6d5121a3e..55e0255e489a7abe38c0392741b756539bff2a22 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 6054d75cff9eec3dc127705dbfe4de47ca586d0e..43fccbbe4abaf6c3b009c8fe7e77210cc2311728 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 c67e0f6c44a09027d076bf6c3f208ea21459976f..6d199deae834f32dfd79f3c2d583e4c5bef2894f 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 9975e6c9c4a3bfadb3f99b319a079ab3491458b8..19dfa2aff5b72bcd232c95f926eaf6a357e8e2b0 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 a70b83c34ba63bbbcda75acd4e15d148c1dd49d5..5c09caf97608cb4883172629219f13b733ddeab4 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 a09339c5d31a10e5b8a6699f954ec70da81eb9f0..84d3489a5d98d34496e85ceab5cf74a60171d9df 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 c39874deb9bfb859be2a02744d8a5afb41a1fe6e..f9e7771f93c563889462c31fc20a6bb4f504c8e0 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 3b5ef198dfed0730232ba741b211c2172a876ad0..ecd02ac5a2ad3dc2fe15cc2059a1c81c22096341 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 4857686559c4606f504530f3547e908aec56619a..7be7c612bec90fae64c9a6a97246c9ce193a8d1c 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 fdbb7ff543cfa481fd14a00e720809674d988ce1..74c27870f702fb1a0e51b2a9b3d0fe3655d22268 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 11758707829f0cb959165419f262e5fd975f5d52..02477e5db52c7a12d1c13d9701935a091b498028 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 1e82fce5b9cfbd200e2c3f074c68640cb21b4e3b..c10a7c6441b338ceabb4e7bbae541a38bf4fd587 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 8f24ab283d3ada67cf089d5baa0d6eb1643a3117..1c4e7192e23728ce86aef94b5fbfcf89c88505e6 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 9fd06e46e513480f61945a8037276677717819b4..60f94e86af1594b63381e3205a1b8623dc449b85 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 f831d5952e0705b835a9060ff74402ce190f1da2..7a8a4bf50b91905f24e04aad2b8d46fa50ce269d 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 fbe1a2456c2fb4de4bcab9fc4c7c9e4af7a6ea65..eb6090840f480f531cb97542dad92fcca15f3488 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 ac8e6e66de95acc2f35e8a52df2052756b8eb601..d12cb20c0c5844fd54b9f0e1df3fd51c57ec149f 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 0b4616707e66da6b85a951f51c545733f554eaac..46203297e05f67419e259db76f29019c780fbe04 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 b68d59031e301f814096b35da4977f4b72e99fc8..50a6d460c250ad266981299f5cbccff14319f8ba 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 80e6b6b9ede8a26d2fb9b83bea78d58e3e1467fb..7c8633fc79e91caa77d5a221362461c6e9ad8b5a 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 e53368321da9f2ff111f09e075fa5ddfd5517787..1313b6837d54bed61f5bc9f81d45277c514b1ad8 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 8b5f6ea8f7a05391d1dcaefb5ff9601324fa52e9..b4a93bb7028e29bb66594925316ae1418f67d4c0 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 95d256ae0656e35c4e0a2b922cda2c88a81e4382..d7ec7e249a53432034ec4f59ec35cafd40087179 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 846011b5665cf6866efeb3d0eb3ca7a349fe2850..8ebd5c61f54d93fa13688eb5aa2c4d4f5410495b 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 82fa8c781264fa874accf90003c2ea4d899376ee..95ce36c24705d0f956290227e95082da28627c63 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 514bfe7817014a40b3742193bed2b5a4986020a0..4533b0cc7ad9d90f7d184f68017ad50f87064449 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 71170148627ad7774dd2a94b14421adbf6d3e529..4708b9b0e5dbed7f2245cdb14f8c970a698e6c31 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 2b28dd8f0d8e35304d58ca8ca77d3ba20150bf67..89dd1c6808325060442d7c4bc8d8fa386f86e646 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 09c55edb3805950ca3a58a5f9dd48a891e8437bf..252f7be1d76468c57169bedcd823d96c1d450e98 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 4b939caf73eaf95c9c3b22755166036b625d875e..9b1ea42a2389495bfd5ba441604f4d80fda77626 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 006c0f9bf0d82e0273aba2b2e541e4a376cc605d..bf1b667727aaf047c00eecea1e76cdb5f1c5bbe5 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 efdaa084135ea6f37c26bde1995d13e571bf273a..8322eb2c2cfdaa5149fe4119d3b021ea955585a5 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 64da80c77306ac23896a4b858afc0f43d55d5dc7..76b6b93fdff8a9a5f079d864eb83baa4fc8b5eda 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 5bdb56a9f7ac2b4be57699df98fc3c80803f5898..e5092005c9e00a51a4e25baf2b3339209213bd5a 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 b9b047b0b2d38f2028bba1ef0220fc3904939cdd..1fd97b395a38214ce47893267c9d95f7d63a2b85 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 0a9e7394c061a8f83f4fdf731e7b674b19cce3ed..99a51a851b3c81c6878255555884d5558c10ae83 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 c5c7515546282d74b25dd01723c17360b1ebd008..29659b82fd7295af4d10907eb815ab4e8756ff01 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 f0f59bd140eace2af1cc507d8c5f9b9367f673f1..9131233e2cbf9f32555cae6181c89b296c930648 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 e4f8263e4b1e16a1af968802d32357e1f8e427f6..a6f198078eae31233b76dd7483be5d02c5ed1eb3 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 5a361e9093186664f9ada6f200c2f85a95b59474..4d459b98a55d4ba6e8c44bc5488d5b4fb10caa10 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 6db89075c71b3773cb6d04112d7bdc0d0ebc2216..b7e749492efb22ad5bfa7adb5b2ac8a6abf8274e 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 613c6cc826446a42c9b64f05eee13f7994978042..5d41877bf77a33bf223e5f4fdc62f86df2ae1162 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 463292997cf2287d51469b70fd22e53d418480d0..dfdc783c1a3c166608ae7d9c897ab5f7241fbed7 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 4d3f5d7d2d92b99d47c0f6337086efc2d7112d12..2c38535d62622fc1444efbe602c7b97be0264f73 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 6f062ad629cc32f04937e317316abef598410589..df1dcccbf43abd45b7233223166fc234acc85166 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 058637b03e629b4aefb1ab02081472a71d7d6e04..5724e7dfa47e2fc97c2652b8851236fe0293f5be 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 598c8812a2d9d4209f718d70a4ef4d9c075d75cc..d0cece92aa3fc6093c66dcfe0cceb498beb8fb0b 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 ec810cbc8af10eb69af64eccac418a7a6e61252c..cc088050f2913b2392b09e7ae407241ac43d9423 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 cbb93c780fd3b6b7e88b99f815c0863190014412..7187d5c15404799138cf880113816241f65be434 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 95d2758fbe669a4989b7187c12e95c13919b5ac4..0838c6b75281847b0f735c3b40af2928ba19ccd2 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 bed212ac136607ee7459f333b0f50bf7f3481b6b..404434feca0f72cd914c4cbdb94a3fa589bc94b0 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 2fd6000eb32a51d8f3a8fe714d7725d209dae8fb..6232ea297304762760f2a8b01ed66ab6272b8bcb 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 c7e454b178a9e5f307c1adaf95e1fe3ee45bc73d..abc759378121d282e40d5bb0bfe2523be5e673e4 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 cfa302ada519fbe9116b2bc33cae39ddeb009f87..4e5a6f10e34032c75f3452bf6ca687ef5d5e00d8 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 459361c6ba5acbb567ae21bd3ff39c84f2b75c22..9c96434553e438f1ad04f9044421913d3b5c3c7a 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 faa5ea12cb985b96b3cf8dfb7aaba6136b39e01e..50e343424b8498d32078648978c719c923304353 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 7b8092ab35ed7214a6eddfdad30577747e3a673a..d2b8da87604f82b5016ee091e388d3e90681fba7 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 7fd8fec40c021be4134d7e0206a32ac91ce33c91..8f975cbf426c304c4ae0681f65af67fcad9abca5 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 1e23a8104ede297eaa13a2c870c7df5635ad412c..f535a6c8d57fd234228f28a118ab9e87487c6cf5 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 624c5a924112e63d224e08c42870754f26f9e27b..153a90c7128e642b02fdf3ea43c568d59821ce1c 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 024529c6927f900e815804567bf3dd283c3d2a57..e4957614a0bb472dbb6073e1e1edd1b39572ac2b 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 2f096e70aa1ffc176dbb126b5990ae3176f7ccac..51082b2736f57daecc081762914b0d7223f19e2b 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 5ad7c47a4543a824e287222b79868098539a1c3b..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 3199537ff1a9938d3f7f4803f39b118a462f78fb..92a631209a444fdd1ea091f061f14574732719a2 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 e16230b9fcc41939819d7dc12bcd538d58e0be3f..a9eeeceb6706559457d964725cec2042e32eb3c8 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 7f3bb0f7d664e9af6d55a612a0e084217e1fb557..20cc6f7ef2fa0f0731d909c3fdc43124cf40892e 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 d6989b1a97a350d8708364e3d32b27c61fc150b9..2646b41854e1b1b47300bf11e1400edf12f22934 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 4fd1d5c704da9d92ad275c890b9bb2fd9d8429f5..621b8c7d108e389ec2467de39e26e0ff2a6683a5 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 003aa181a9d0463a3f1d31ee83fc7ff6b21f5e81..6d1bfc1552b2e79905697a70bc0d2cb4da885cc0 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 6ce7d77bbdb0ba9c51ffeca432b4bc0472e3ff7d..89e0807ffc704af18bef569df3585aa7fc21e36a 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 3e4d440ccd438af954c02af936e20f10d9c8e36a..5255ef8ca3e8a88be1d60af0b8b3fa4c1fb06e1b 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 9853918d7cafeba3919e244ddc169d3e6d525449..7be5050e36aed914ad5992b3087322dc02cfb0ec 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 2b12ff853a553615823367b5f557b5ea9e39f584..87052d9518b34b8ef3fd5a947244085382c5c396 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 463aa435708c08be531b53dd8896fac13a92d266..6d8533afd9dca27b58ee3aeea4b1d21cf2febd71 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 f533c8d8412a5d773f5974a5fe8de598d8683d53..e882f92f7e849d2805f8a94ec4f5d8cd11b9d7d4 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 9eba8bdd06c58a8f1c6e37ae56e4194f870d4c60..0f5d4a6207ca5caac051c10b37e4276ac23c1256 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 183c081eee66839d5fd8827afd4d409f2cd64932..0b39d964d744e37f7813f293083ed7a5013f136b 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 01f9914cc141eb3c49fd73506e9b1c5470edd781..abfa40820dc99bf2c64c7bf0a31994eedc414e03 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 bb5a8ee66be1f856995f98b31fc2a1afc5158da7..bf9857c670738671f33772d16a47a1a3e26152d7 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 48bf04e69b04e537e5c3de4f957a87fabe8125c8..27e7f248c2c19747c049625de6cd202a2e31da4b 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 44378a633bfb60108b0c2d9e942a77e0292d45c9..141b1604a92f08c4b80042aee16602daf5d428f4 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 63f75f28fe2c796054a7759d1d3783470107f52f..520f35c1b51515d076805f69ff04be934e7ebb87 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 1217b219355d07f6752b32a0b62d3ec75ff1d7b7..77526edbb3d7f0d9506eea879469871e83f2ee93 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 d5a3552d6b3459a77d30df65d0bbda4a86c7fa61..053c10786ef6135e5fa994c2d825c36419c95112 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 49544126f43b0d314a66616fc91bc34058e870e9..8f975cbf426c304c4ae0681f65af67fcad9abca5 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 e485c8923ea861c669454a68eb99716f86406023..66a4060978ba6a2e8c4c7ccf9303e7fc03707c21 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 1a2eff60d43a3665de85db7d293747a609f160b3..9afbbe1de7d3bb358283f2bed1f0ab090aff349b 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 43aa01510ca1555d6ae03a34cc218ce97831fd23..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 a851ac32261fd3721a82f77505c5cf69f79f3b30..03850940694ffde9a838d5fda1750ea61fb0cc1f 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 a22e84c5d0fea626662d8c7f11f0e3b0748c5a1d..1798a003e165a12a7413a4168f12248dcad006c6 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 fed13c9063cbe37ed84c0f21277fc66d7cd48868..2e2e14aa18aa54a98887ef28db4f26653eb25704 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 a6789dc208edb61dbd24e16d0b40818638ae4467..cd2c0864d02a070050a6dfce39aaa4ed5a01b9ed 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 ec494ca7d112f254c7460c45a08664488240971a..99610c5a6d01f3dbd4b293f77af99531daf57ff9 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 b9c472403e124b08a48938396c05f8d0f91e9674..5585278a806491f8bb017f1b8f5619face836d58 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 5d664f823dc74e062cbb804324de82bf7d239643..f70a615ed2840293ed3d9cccd4c7ff514b4676ab 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 d2f9a54a6ba98b17f500e91dd30fcda0e4413771..f7ba5ceeee3f78f43743e3d8aef094d009850ae6 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 110348b34b01994049d4781c0005e374ec71a8ad..252dc18eae87ee274c4349f062c95ff257aee804 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 78262fd2466073d6d8edb5721d96eeca932d458e..d4234b02c1d5a817c691413564f16afebaac9a7a 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 28b267e0111ec9572e34017fdf9b7034f5ad930b..4e8068e73885ded3f8eacd3d3707791c8c3b9c97 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 97ab831fc7a69163163f7182f1f8c61bd9e3ffc4..2ac31772c592bd967935a873ae08d3ba2c0791fc 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 6e0180e02994df9e69052f3742d667e7dcb1c044..87ecabbfc4c4d7d8b20f23d21ce425a0de053849 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 f74ec112e2aa73c682463ca6d0502e0ae503e1c3..86586ed2c16698bde72d647d0d174663e15b079d 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 d5a3552d6b3459a77d30df65d0bbda4a86c7fa61..053c10786ef6135e5fa994c2d825c36419c95112 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 62874058da961179abdf731744e9d8dc95591ddd..8f975cbf426c304c4ae0681f65af67fcad9abca5 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 cf7c0d2ca60425a2e5a842aad94d97c095a47761..4520c84691184c8ab699bce82cfc967abb02b948 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 b2bd64d4248a554e6a94b7909320aac8ac92af64..a6803052e0c0ff15c8bb0ef2e96c97f27d7ca830 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 7669fe9aeafe6cbf5b9485fcaaef47cd897d6b2a..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 56493bbf338d28e05b8220619df9f9c910957d40..16381a1db9d87b449e01620b4c7f37a939179ed8 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 952fa9da465881b2782b4b54e801b5fc186d44d0..f470096294458c04b0e448c35d3ba9c313ce41da 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 7da75a55e5b9aaa9fe037a084eabcc3a83d74762..a7c83e71d656489bea9120c06c796f10bccaf7df 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 114057734a5b7f492caff2d07ea19f3bb0a239fb..f5d5e0ecd4acb9f7380c2a57c58a8124e06afa91 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 e56e9c1e4af413271a9d7dcca798a629f36df063..a4fe7ca4eab585e8fb3fdd59bf1afc65e782308d 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 f25c77c3565d4e464e4fdd401efe977fa00666d9..b26a62f2bb044e9c0aa62ffa909c5e3e57d29f2f 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 ef5604a6897f1eb98cb0b5163f48d8a121614801..2fb185c6d2241187865dca49d3019552a3c34b86 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 a8efafdc6085191fa438d945f4fb3c3876a0672e..d36a4e88a17c250bc2221f724e225be6ede33053 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 cae1546ad2822da02758053e9f6c4423da27ee14..beca8ffd297744c5f663e7c1df6e2047142f5148 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 989d9e4ced66ccbc86ae916f44e50504d292c5d2..db5cdc90d6a0c59d66764f5350228abaa7a9cafa 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 b32bbf5b4f1927abc2e14debdc2756c368a7c4f8..db5311a176764c80fa793689d6db8576f6c4f3c0 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 a3e8ced6501ab3bb6f1e1da5399eb64f866eff04..9209767da292497b8cd9b8faa70e93cb711aba29 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 edeb62131033dfee12a6a84dbabbd87bd6f24648..3223c999100c4c4bb5f0afb1aa8a3f5c1201e7d3 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 16287a2bbf448c361e237aea4f7bae9788cf87b9..54d6f33ba29cd445d1c9bd2e424254823ffae421 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 fe867a581d8d2126a3230c83ee015c78971e625b..c593a4122eaa6a814731cb88a1c09e001e2c802b 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 38988fd0cb16d2f4212849d12ab3762e31cfa8bf..4084bfdb45306b7bd78a1130930a76d8eaefa7a1 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 97ab831fc7a69163163f7182f1f8c61bd9e3ffc4..2ac31772c592bd967935a873ae08d3ba2c0791fc 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 e6b41b08c4877084cf2e81ba16474d08c6686cc1..2ce066eeba789cd59771cdb8c8e9823d151d0bc6 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 58c88c831d3512ede769127cb81447579d73ea5d..f4b0d8fdf5800ec6c0c995e1432a3f542547fcd0 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 efbe3c2d4cf28cec298ef17b394011dcd6aa66cb..053c10786ef6135e5fa994c2d825c36419c95112 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 8836f998a2d05937e7e004fe899e14fd8dba2bfc..0aafcc670abba4ff62f51e9c6feef77815589a1c 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 fb741fbfa6d23a29ce7df142f68a02b7885c946c..39b1889d6b77c982f18986385e4fc04a7178d583 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 8f657c6c770a4960596c0dacdd0eeedfb4f8bab2..c741e68b91b490a5548c213daf3bd032c74831d0 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 fcf63d51636b9e065f1ce91084bc35cfbc40fbfc..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 25fe56a3fad4e8459d8804e21905e4b3bb9c18ad..1174800e0fe1f17bfa0276948c4d9890a3c88084 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 f79d8eb3c355e63828844d3ccf69bcdec4a3794e..4c1ce31df166ccdf798ad532997afa0400ce00fd 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 81815062b82665fdb6beef607480538ae5cd9b61..2cb1a216ee786c7f0eaa6a45f042337cb357f963 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 7951efc4e59ab29f80728fa66996a0e24f5c8501..a083ea9489c03a70869dbd2e2cfe026c016472e6 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 67c1a70f5363b0456df711a94daac35e2a6b3e7d..5e8fb961815bd0a4250a42f78d5514f17caef189 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 04b99a7005e6482a49e0ecdff6ec079e1163c264..e6b697a16299e357bfd4f9796fc95c392dfa855d 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 b98c3dc93e4592ce6548ff3cd132b1f97d9e0838..7c93f551fd7dc53cd6eaf4c077a27504ec3feea9 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 875a9539a991c3ec4d5f15bca03153c9a5aa89d3..9cbf6ff5b314fd81f7ffb6670eebaf043d0f867d 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 cce0ff8b29b46d1d9d46af2f735ae215a2570931..cce42aefced990612b5ad36cafb7408099880942 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 9f6206bcd5c7f4695174a8d64408f794bcb0836c..98745d95e1024eebc8021380b4951503333facbf 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 21e0ee1924b54788f78d47968c49913060dc9b4d..7e4f7c4a4859991c1104d7b7234cd9803c8198f1 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 dafc996022a9fcef5272670b62c83308496e3250..bc7034d3b3334c6c673daf8879e6746e6f8e6f1c 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 4eae80d39265590e31ebc7b9adca753c1e1b9b70..c07d138fb41e81a3fa7d8040f1d63472877da0c9 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 69348cab436d50e9842176551449990a7906eb62..74bf6544fd466c37e56e3928a20690fc4a120a16 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 67c79e30ad07e31258efcf5b0a08d97f7e9e7dda..75965c054a9c0c8d1105ec8b2c4f24bc97171a98 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 3cb739c62e704d23f91a66073abc042d25e18423..3f40627b5357d5d830be9aba4fe902833b467d47 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 4b86f968cbfab20db046ca76e0141200c2ce635d..7d19e3393ff119578dfabda9e913a8cd631051cb 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 17760c2e55a49bbb738f3272d4f51bcb9c871a57..a7e40ff61897e85c65dc94952d2cc8b102be222f 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 d8164b5fac75c39477440978536712ce2def54cb..b7af560a0407e1f381e2d515d1fc72db35ac10bc 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 e9fc81ec3ec241d3d5a2a6aec76c784565bac4e7..841f7dad5d14bbaa2c82e3d8b40b83d396350333 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 234643996e1681f5c234f492438d47dfb8b27b6f..1d99c36b21761bea841c92cd4a3101e281d38758 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 60550687102952f3a56fef710b9aa9fe005b5b5c..4ab20c6b308caf952b54eda94ef862c141c3288a 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 92fc9d558f114156a022358b467ac7b0e99d8ff6..f7e3fc5808ae288022ff8858a834bd7ab6f6637a 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 6e0b387e7e62b93fd21d96c5c9d1806e15efe8b7..db7461ed893b86a2de0ce0434f803574605ea7b3 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 a258d3397f6555f8c9e51e4b00294066b2f49c22..4dd203f43833394159db68ddcafa2de8869f0f27 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 3245960ef4b756b5de186c44354661e080e65500..c692296e84767fff568c5f15b29cb359e9e82301 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 aadbd5106a6e375c101b473714f8031344d9aab5..8cb287ae555465cc844bb26bd00156ec1007a150 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 271b19bfcf91d90b688e62e2e35cd0348344f189..aa0d9101133ac4effd0b3d13ad5a0d1a23917c4a 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 7e7499cf5919f57f912865f5272d3785338b4a1f..498296e30cce3b71236705e359aab270cad0f456 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 421b7c368899729ad2a81192cbb58dc5c9e17d4e..e8c152b2e9f89117b1479b8159075e50e520ba7e 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 f4454d1e15f39f717679bd9524421ea34c3da25e..371d6452270de67424a20bc33418b92f10889455 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 6cc058a0f40893f6454827292bb68a8ed2ef3f9a..bd8783f2b51286cbe93199465b0c05f38c3da89e 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 a82106480d2b41fc7d87d5bbd35379457b7e9c0d..5135c5a7e4aff1e2fb979606665fd6a56cf9ff8b 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 ee5b860a40b017dfde80888dca0ccddac8a0dbec..b40cde6be43a3cf40843f00500e5a1bfb162a374 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 f530875d754e3032a2e791367b6a49f4f66b6abf..6e0a6c356c95406644737e12df8018f253f8e514 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 3215ddaaffaf47be94d63a3fcf2b88d7f70f191e..62ebc962cd9c1cb4162d2e83969626e9fb83d238 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 6e68ec4f78cdd4cf8d06263fca35d3bc7c49d94a..339b35c67ce6e89fc2fc8519caccbfe529849527 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 78b52ece3e376b3213c6bb5b653ed66788f99da6..b8024ec96416d6e066744acc7828945bc46c65e7 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 8d21330b86797a9fc7f9e1ead176377866c9b121..6970e3dae428e3d4a557117bea7b654cd1937ab1 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 0f035470fc25ebe538f0f414d5f3f71ffaf7bf78..2f2a6aea3070500e6387121c48c2aac2d69aaed6 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 03672693b604e7cbd316b1a6c1d4088c556ffde4..0250ace198fbcf2726f0ed3b660051f458d7d824 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 6e598a1a404779583c3a5f7281c41a92c760deaf..0779259693afc8ce63822d337f008972f8ce787c 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 e0a21cc06489ca05c3e55c16ac31a67fde4666da..3e4f6efa3593cc2a326a957b89af81437e458d5f 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 b0510f7ca3fbc2782268db5a4e9f58765a7fa2ea..8b9b70a839674a77e3bc56a313be554c897da204 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 5a97a4cde77f9c812876e4b494ae9e32a8d8cc5f..3d4afdbc502e49678a51a31478d1c0c451d6c32c 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 88a422c7aeceb4316024fd43c68b40b8ed2fca24..58101ea1a06381187e5c1458bda7487e5e145159 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 a2de7b19033b6077c84be5f29a78beb2e8beebc4..3594e776f541076eb5210fecb462a24592e927a8 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 d21ee573a3cbbf0f63948e8686652ca56e32d3e6..ef1d8c3a535c0c5658b4babb1458fcd3dcf0bf0f 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 bed212ac136607ee7459f333b0f50bf7f3481b6b..404434feca0f72cd914c4cbdb94a3fa589bc94b0 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 bdf9177a773a06c6542a32a3b48429b53092ecd1..2e071c8bd0b60f7be06ff5118f3c8cf175a99244 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 7a5fb82f886af2a6cfbdc80bdf0953ac63a7c3ab..013889b0a2a5f47dd30368987b2979b096bb51b3 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 c3d095fb6726758b7e61cc551ad5e3a02c9b66bb..902ea4657d659a285c1ec58e348649eaaa9978ae 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 3555281a625cd073af05c6905feff6637d3b8294..57fe0c70c0b3bbd1b9745b8423a8e21d44c42afb 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 e49089a3756b4b3946bafa93b4138721e8a1be7b..f9daf00889930f64567a573ba7bbb219ecf585ec 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 9df3ad409ea2bb44a3e260745e7985c32f8008ec..37aab4b373171b579582319f488f681baa63eed0 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 efbe3c2d4cf28cec298ef17b394011dcd6aa66cb..053c10786ef6135e5fa994c2d825c36419c95112 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 62874058da961179abdf731744e9d8dc95591ddd..8f975cbf426c304c4ae0681f65af67fcad9abca5 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 937a1670f3134cf92e049dd4a55abbd3962b3fec..168e903f1f9f272b6f8bdf5e289aa97ec0c2c23c 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 68391d8866eaa6f88cbbbb5ab90fe07e792b17d6..adfc472a567be9deb866e90eab1d8986281be0e8 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 94e57f03c941d9c6f07fd91ae8888e8234f35dd3..66b0c8c5cd556870bb6d019c2aa254d7e5b01dce 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 5085357abce26cac3cf6e4d9789c6cdf0bf73d73..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 a64c38411b05bf8ecd26bf3201930e35c82af363..95e986c1f31988d0b6ce011546d89d7180cb4ffe 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 e99c495cc71913079048f1d133857017086920a2..2492b928ec63192f90df8c7f56943bcc69846c23 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 1f85dba5f386aa180f1b3a1655413f38c2487565..3487b6f38820c2c3312f02c86538bc0a30a868f3 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 331a7113d63dad8887309403231a1dd8a43a6b8d..c59fc51faeed458a548864e126eebede10fd7e57 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 4d2075bc3f61e5e17bdf9e20179d8d066362d42b..30c021c2c6c067dc6e9f8ccbf3d1428b36816c19 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 3ea72ce90ed879bac58e4c6a969d3f335b6c6196..c088f5bd2f98e04e0f69e2073adbb6f163b4bc11 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 417972649e5961125c7dd8e694cb7e9aea0cd1fb..336bc44c7987e97e113531749fda0a9f61c3b60e 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 eca654779bb92504e3ca3a2003b67bd0ce752d38..4275f2907b2720077cbf443e4cbe385ec679dbcf 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 fa3a98288ec4c499c3afe8dd5ca996c603d27e39..381df838bb3d53c3eef4a68bc14ed3c23b2aee76 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 c15ad4c88b8826d16871a015138e267e85c27c27..ebc44655810f491d8b54322167fa858b8a657107 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 e9c1638da56d444147de66da43635eae9dd0bb5f..6db6dce0dff50e6415c2e8a12ee4a05781648827 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 5819d5f219f368200c8ba7551c32d294abe816fb..34b6e912a343a93ee359914305261e68d8e3158f 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 e5203eb6c23c0dff53314bcf78276c438b5f4fcd..93fb327500a8881a97fe944506217bd744ce836f 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 5676f21613b28ee2b1e4e8e90b118cec2d59439d..57deea3beed891b9805a84b82d303cfeec05ee90 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 adec690a5f595137abfa56f65beed511bff613c8..751627ee5b61091654f48a6e4a65113f6b7a03b4 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 b5be85b2b1f26ce22121c060013ad63d91364575..05a4ea3eb8267b5f83d8bdeb71476385e58de204 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 9200e1bce298ba06b79f4b9dfa08e6e37452589d..e59efbbc35e41ed537930e1ae20b9a133dd83dba 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 e4cd8473b54ed0dc1e957c2078521fe1d1e53a45..fef528652c2bfef2c4b7ee1bc00af5129a1eadf1 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 51be7cd3ac4b4b761e61621e6d82c10a8d6e33df..401b92e577156034ea63bca357c5f536485da7b3 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 f669a853f74abe537016e04a1bb97fd3bdc866b8..568a10bf718e11d663b2ab6792734cdde7612f4f 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 45c7018d807a66888349b19265a702ff5d8b2d96..69ee22dac20e1a6fdb3d9d79477097f2df6eec2b 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 382105069791c075b5ba62413d274dea8b92b9fb..8337fc1bba7149a56bbaf39aed2c969142065ec3 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 d8cf6b724227cf16fb152908901ffc5b8ee06f04..42ddd5f046ded87bbda36eabbd63c046e342c58b 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 9f3557f5311fd85a47ceb2855cfeb427a1e18aab..795b8890bcbf7a77e9f4105bdf965e959a0eb672 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 c34c73bcca867bd43019270a306a27d3c3c71bdd..1762fbc704b1604c3219ba6759004e1eeb00df50 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 f633723b71250ec6552a0bf739031f44e5b4f88f..f2b3d3b0712234587ab1ea6b576156b3cd03c776 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 1e5f5c3e74bbe9b44f90d4da07961c5995017361..a76dee2138581594b9b50b2e1213f97c4e5caf94 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 2f8b4a5c67b2f57a9083170056ed7262c5408c0d..6773c80c93f75858879e198bfaaaf732d700b1b0 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 d07d4876244521da48cb117e399a9c70c191cfa1..01cf6762ff9df505614f9fa8478a669f46760918 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 17f20cdd4d2762f9ebf52395d838bb2e223d2346..3d7e5c83f6413e3fd7dd181682785e8744b7d069 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 4d678058b87ca15f66af414fd0d96873d9e7310b..4eff20b6fc392738fe7383b0de538eb7b80a5307 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 694b07d0da22d92daed1c1cd4df576fb2ffaea57..588ecb63c229e45a6f39a0970598a8160699df9d 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 5ba950425bd8155d65f2ef74ddc926935de39db8..a70f1a00f53bbeb181d38273e49d029427a51e23 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 07ec559435e0708abd09b2486e42ae5373ac82e2..4cb83ca670e926e5391a3583e5a52b539ff7f029 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 bfb21f7326dfea0ff8678d1113b84ee612b8fc0a..5b9f5bb7b6df2d174ec3f7d3334c97fa9b901cd5 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 008392447efd02ec24438c50a5df10ba4987bda1..d8882bfbbbcda2a01fabe7b827cfb91dd2743def 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 ac4ea3d63a4ee1fb82865900faf48ce78ab427e8..902cf1933feccfd4e1dfa2b293a6598afb903d38 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 fa4d5259fe1422248afbfb8ebc70df2536542a33..17eff44ae2171e0ac5304e39a20abc2aa583d5c1 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 b87ce0b50622fb9a1bbe66d4f2af88186b852b0d..f8676038ea967eb7e4720c1a5a4f26db9fd3bb35 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 01c0842820c030a96cfa4c933c447ae1b28d7d80..1a8a1f97a4ba1a0e927975d9c63f76db7b095c16 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 1fed743c56b1377499ec9a2d83951d5174673415..40a8bf7bbec0b9b1ccc6a1e7e20d27698eab840d 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 25e5dcef3349266b5871655bb2f99e01bb2b4c89..3f9f2e2376f97455575e1663e1328cc01997dbb1 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 e1fbee8dc9bf33a0d65e8ae19ae31c6b02dfa136..64134eca71ac18bedea9675a7dbc58592ab09c68 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 965fd43118b69e4d5cad0a270fb015c9397df35e..f45227d1d0f258105f1071b21ccbd44a092c6f0b 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 8ea7284cfea2c647814c5355fa33050c25e4af83..a62a475cec8f7161a6d6bd48ffcefe41c33846a8 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 07f77277ef47ad23c87e28249bd99cef308d3ade..618bb46d93e05119f0b4292c2dfeb6a2b4f586d9 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 8804de2c1e416dd108ba8923c872733f37fdbd4b..7d89244dfd0f6a0390c8878eefda89988cc17cb5 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 10e9114d976dea8724da4d23761674694927cb6f..bbf924527ac4e21018e437e264614f8e1175bd84 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 437f5b2a7680223f329b0b3112767e3c42e63aef..a92a428aa51087ffc42b7bce764e117e877d2c4a 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 f341f1c94b218c3a090a60c8065a404ac23ca02b..6f2ae66268e0b014b12f50e956c568313a500944 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 5a99492891921845f05be5fd89c2f4c80f8d2480..e6c06126627a42f13a61c59cac93a5dca5e4c061 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 08e387b0eae711bb123320886e35e2859fd7229c..cb2fcfe99585407811692e031c81b8d73f2ae570 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 8493f59d1cfda104b44b7b89e23bcae40767f69f..9ab8c7718399c694a099c25489f47cadc81fda95 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 b59d1dd7046c7bd6ad01e24f2112079e7c87959a..0560f90fd1e414b9da2cde14f59d179c61d4df5d 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 ff87e785326717c82237cccb4102c3b7ff861698..fa70435cf343f93ef8fb6d1243d908a3a93730de 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 3c562601e5a8bb2314ea9771de3cd987065db097..ac3bb24275fe24527cd8377294fd3228c767f25e 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 6c84f1adb3418a54ecc42fe1ab08d7f14b787d48..1bbabf845871d651475e7da75d0763bde4c45490 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 7b16c081ff3fb059d5cc540edd71c1c409203cb9..0521026981694ad6bda7f3a7810f3fea1dd47c0b 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 99ae834de457421324b10b0c2d9fb282e7c3695c..99f4aab2780db0706387659caa861045cb198cc1 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 38ff4d53caa82d396e66c7d07de48095fa4d3948..e78e057a3ca56201e0cdb0ae9ac5a4265dc8270d 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 9a6b62671d8e1990cd3346fc8c36b3e507849277..ad689a1382d2d0b9f89fa89eec8343f9976385d3 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 0a028785000e975723936a0f42bc67869be808f6..7f56cc9f9d114209df1dc5f7553362ad8a89d76f 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 627eb52b271d3a0b32e7006b1b24707ccac4a473..c10203df5d243e4d1113d46889a179cec6a2cbf5 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 f10fac8fcba65a1d742ad13a9fa4250eff924d84..e1a4a1f24c6a5f648737d9c402914cd3af050049 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 709e34cea199b306a00705e45987d618cdfec3ba..5777e684360941e7db1f5413d3abd0594c458009 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 0077354dec83d45767653535faa1c1d55cc5c6e7..f1ceeb001a04c47189d64f7f3cd379e533f1769f 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 c55e721a5dd1d0ecd2ff0cba98a557ea4492b460..8da9951b2baa6ecbba37bb2ce6f00d944854faf8 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 7e06036bbe989f82740969b149da6ca5a66c1988..b724d9aef5f5a791e47b4e381d347ee72d743b58 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 d8f55b6e51e6b17282dd3f0523de653de1055147..eaf2d64136bba5e1eeee6a623fa874853889d12d 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 22fbd8034aade66dca5da6e5c2abf342ac747aec..defed2ccdf4811792f1c8e90ff70d50eec1d89f6 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 873a8a82da6cc387c49e8c7de0b5615edb1da230..eda5d2bcae556fc1c4515520812a8984813dc8ca 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 97ab831fc7a69163163f7182f1f8c61bd9e3ffc4..2ac31772c592bd967935a873ae08d3ba2c0791fc 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 450c6bc14da6689ff9c70cf804afb767bd00dba4..6877196b2e5eda95aad456588eff4d9279c047f6 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 92f7c270434ba8fd56e240cf00a27f92a4fc5260..43106643a5b2b328108e858b417ed68217ca18d6 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 a15c0d90e8d00233317a6c1ab748b8ff150be80e..3a94b2c41a52c0eb7728eba6d1505991edd34397 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 f179a455e791a7a98561f9f96752ea309dbd991c..c65a6a20313002902b4660493d05be5c4cd20a24 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 d5a3552d6b3459a77d30df65d0bbda4a86c7fa61..053c10786ef6135e5fa994c2d825c36419c95112 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 cc83d0f40e11bba25b00804f9683e7a258c5f373..1f0302f64b0ac1791aa594b5b16772343af286b9 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 129d834a0e8bb3d6acee7bddfab292f48cb8103b..c2bdf50f8cafd9a4119b9bbb4ccb7922afed8a81 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 87cc3a65f5101267a9c81ca548812a533b6bca23..1999a2daf6fe02fafa11228a93bfdd50bf1de243 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 0d4b20447e266c76353bcfda166467cdb3edc91a..28d876936c1dd8f8de5694d78ad88fbb9b7a3a77 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 fa9b0e583862453056c698486190d71b95a8caea..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 642d94a309dde9faea890dbfb8039c1f56bff9ea..d7f252ca640c86806a4848e35a4ac993966a6c03 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 89a5d905a934c167554286848c6109fe58915dd8..cffe68d5dc05695e01201b37e088cb6e19d02936 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 d7ec5735fb2b0c420e4ef7adc981fe40614f212b..cabf7c8aa0f77b157ff71e631a462be837e3b519 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 ded1b791013a27b531be77f4fa830e2eb7626e59..2ecb4d636c4afed8406f8950a0337a44253ec779 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 41076a096b703cf65e587c4d53ee35ad94640e95..657d6a724c0fa288c0c2be3b36d3d5dac8b08858 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 513f6d0046341ede6cd4e567191076fdf8279c17..87835c09f561eebb4b19a5b4b2d1ec1dcd31295b 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 57744179fb594eb7eb99a474acc63c9d388254d3..0a10c19db834cc70ee16f422c6b113a0e2d72ef2 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 ec4bf3b204bdb16d104083bea22cde607218cb65..708e8bc4f46ebbd8a31006f60bd7e02eaff4200e 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 b47fd3ef52fbec555f3be821ac7fa90156e69f25..fe2fcfe31bcff642379cdbf6c5699b2c8baae61f 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 52299ec8fe980efe5b0f2c8a1399dadb756c2d68..5282c992ea60156881f31ffd5928f3a91a5c9027 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 92ad8cf0554637fbba35eaca853d8a36500989a7..f5c22b452718589984da98915642c2b09c9c6eb2 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 f6fdbc5ffba663dd54bd9bead81f0aa328171112..60492f23380a8617310df55b9030df0bb1a463aa 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 9b7d55e228132133c12a33fc99effeedb6be9c73..2edd1f3578279a90d77e9e8836f41d275b2b2eaa 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 7504d0b7020909a67e013ea4d18c71fd2194a978..6cddfc9eca54d3914e8c0dfcc0102afce2331ff5 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 01f9914cc141eb3c49fd73506e9b1c5470edd781..abfa40820dc99bf2c64c7bf0a31994eedc414e03 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 b5bed44324c851bd2abeebaa5826f4a8635db94e..695b3ae2d76701115deac7f2d80317cafaa8793f 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 96543cfb26ecfa070c11c31892dc5d6723f80506..0661991fe4961b9b4abc8f62cd31c07e7575c985 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 cb2f0b937a55d762a7f02bcdbc09d44a1865a5b9..d20daffd0d563609e153faada2fbd1f27dcba62f 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 2d13802550e9a1a94954bac8f2522a1998767355..3814c71baae22c5e3c1d4ecbec43f4ae0cd75704 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 d90174bd54c22837404165be6aa55ff55ad89abf..fa7bc67ded52be54b4222c53b05e151d4062270a 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 e9de5ab2d9a73ccca2331301f6b8862f45822be6..f80e6b2e666574188740a99a0da0837ea899e01d 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 641d4029c98c529e454163cec68c7f625f158c15..0673524049c90b5044e52d7f4faa8e199913b85b 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 cc631b0ecc40e17128712bb537038487e0134846..1f0302f64b0ac1791aa594b5b16772343af286b9 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 1f3b52523fe6cfc1c747f499ba7fe1863b10ef1a..5092d6b6bc33583605737a93d210decb0170ca84 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 9d0c69ca88f765d40e48b353b74f9d1cf9eadf76..94fe1d4bc014038a11cefbbd2cfe82dfa5c7e14d 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 3885c5894ec0dde63d0e5f0593a9d35270f5cb22..e31b74f68003a921d8d3d3e2a60e851f4a8e5b15 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 b54e14b505fbf7aadcbfc6f6c4c665a9c25e31e0..4d957655c7a45b96d9a0193333a35f1de7a47acd 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 df30219ae9dcfc6a132ae02996fd0071454a88f1..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 ccc48596a26feb79bdbd871b3a4c7e8793247a7e..40e90aa6254b2b16f5338c80305125cdd9fbf05b 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 787470d3dca13bf0ab5c4b193c7c8da7de646666..8d8ae4708c42e76200ee598aacf4d643a4df8c07 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 0492b259ec217abc70a8edc84128d50d86634ca1..14b0d36b47f51f02a1eba14e8904e281668bdd19 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 ae24c559a7c66fe5c1347118c1d7b04a91f838a1..d4fac36d17bd2ff6e56040683fc20ccbc914a556 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 b4fa7c063c1254b87ff7f99311aa84f0d202a5ad..94b868bebcd2edca4e57d5b7a1c7e6d87446f0a1 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 a91645f44f43bbc33b3e377ef8b998a10ec67772..d69e24ba75985f9a34b7370fd6ebdeb8d8bc36c6 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 1f4a66a6170d6244f192112194f9b1a686420432..f99e4aedae9b09337c670881277243a2966f467f 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 5c6c9072ba0adaebc4159ab1cab4634fd596dfb2..b8892d621d6c465009716813c0d4ce3010f849e6 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 ca81b714099046680e2cad9028cbf1791a245065..550649e40a9e3c4371175299c3a22a2ef8d06372 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 f4754606966d1d27ee0da8a40eb20199c8544dcf..1bee0024fd3a619ecf1d16813f26af9a3725b324 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 0fa074cd8f170dcceb8e5da6544f6c8855955dd9..4c88245f94b88b140eeac6171d234019815855a2 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 49c59769846a4ade20f6c52aaf14bb4f45beeaea..7ef6a2cd12e48b4c1ea27dbb6603a21b6c8a5b50 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 9707c01b0f6dade8064dfc78eb0eb5bd41ad33e4..dec959628c16f492cff126fdd8c2928b700cccda 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 16472eccf79cf966ceec53f4e07fb293bdca4795..4dd00c7af87dc50fe1ad6b9940c8b470f10dcae9 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 7934c226363efd82ecf40b994d721fac182e7c3a..e4bffa1c6834d9da8fadd80a9ef0a58a4e8fdbc4 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 11c7e160d686ebf834f4982dac37caf0590d0035..bfca85a70a36e4bc6fa708d32a8d74c889f82e04 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 268ec6662c346df7d7e0d4af5a914aac0f202c68..082fbaf1aeb951e7199eb70647a2f8d39735f162 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 37f319c85b44885b5729400062f56e81c435c2e6..3270bfc550671772f04e9089e3c70e68cbeff70a 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 2c575408c88f0cece05c3ff00959596fe07417da..777b98ed5fbc2c0337000ee68db6b003d80c1a08 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 2589c0e3d36b44b6a11528d006ff063f10c7c837..728f69a97952fdd9d256ba460856f91bd8307d12 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 71ec7c07571e14b7c0670b207f6a8cd89e73009f..82df6391e1ac6b1253028f6edac90e0c7840b1ec 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 0923ce76b63a5a33925780b7b7c9d56a2164939e..c59a6702cbbb5458c6fb9df20adf3969f0f18006 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 d16cbaaa4e715e6eaf3f8745acca75c61c6b1483..433aa9e86eed54a6499d9592629ee17d96d8cf12 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 0fb374f741ca0a8cdce6cc64e9d50f575677ec13..7bfb24aea35a99d1598137df1cb78f603953e66b 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 cf96f55d0b98e7e28b3966c9c7f83b49d43c6b96..9bc6dbd52c146d8a6b477ec6d520f9c62c9fe00d 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 3b773f5106ed3a6842128c624b58280216dc363c..7b15b671711acb96bf78cb2d285aa43c89613f9c 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 ea57f68d20cee813da2e048c99546e89fe3eba5d..13c8e1b728b0c0e5c1aa77b258e8b3eec1601aaa 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 8a3f6baaa04281e9bc98bd4cddaa548e1cff25af..d4ce9418c9f81429e04d259f481296f6b0fb84d0 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 252aaa7ab7255b78604a55405a853cd4005f6b3f..ac7c9ee947d49dbbf350ba9b552285d5192504a0 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 9eb3203eeb8c81225b7cd9c1be7b50c750d03532..dc6ae7eb66a5790f3ad46a5469d3e3edaa5adc50 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 4d3538df63d55171b62948b7511b91f697737d76..a76f56fae938dacb1734239ba6e81cdf70038454 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 2f17cb84bb6483097e037622aec5c1b41d503630..35c9dbf5b7190a018396cd9529d63e23829b752f 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 fe7445dfb4764311b450577c3f4ea23b40d54082..6c8d09d8689135cde8c056ccb40395e5a233eaf2 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 59142370a751028a1d3ac63d73f707cf78f7ce63..01847e2b25c67b269906c42ed1c1bcda2cb2823c 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 945060fed51062a3495f9b2bad6bb94ed4f844ed..e50c9e0156d90e4b43dc914951ff08f787b8e186 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 d03a51fe82c14d2fd4b72589ba5266be20be2781..d812d30d0c2d01195a9b3a1d8e13533df9900d60 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 99b85dac86c249a17917c569fe0a314f249329f6..2d0b3c17db4afbc15b0b13d915399174cd6b9cc8 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 ff4aea1cb44ce283b31767862f5c3209134b1b35..548e3753599f8f5140d3f4fc30815af64dd70e03 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 50d7db722fbce2ecc82dc8bb214de23fb897b9a6..7b5da39915dde3f281e64fed7538a37ec001d0b4 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 2aef9633efc33a1693d6d19825544c48bb21e1cc..7fc3e1720fe863c3e4fcf1a5e108266b2377005f 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 88a428d469081c0d273a1997263692c40bc77c25..7a89fe9675241a553b87ce3a27e81e53dbaa7547 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 4126d65a176ac2538ca85993ce978050fe1bd0ee..a53e20f2d53c692458e5042c6f57659efd32be3d 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 108a343af2bf38eab1be3306648e840ca9c05c36..07e31c34943f330f77a4548c2e7f12628701a50e 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 c64cf2716bea61861d9c0556c7e7231ac090ae95..7f824b920aa117a74730d8d5cb6a7236e729534a 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 c9978525d679bc3bac99264aadc3cfd7c45bb188..76ef07950be6c5c7741944d89558faa4c457d238 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 2c8814f532b3e06803eb09a2344e48d1a79c94a6..38d161b63347b1e3324847eba5667e10a6a45a1f 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 5ae15b44aedd9aac26d9f1b19b76bc34ed9f97a1..8b1c991255816f36ad3ecced8745484a6162e5a6 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 8a81b617334ff2f872e4555ffac9555f95b9dd46..48e8769b25cbe6c591bc4486b116d21def6a8fe0 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 58b9b0c49119e609366f6585e63a00fc2a0b5f80..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 e60b523e09791c335c1b8eb2280e9b02edb024e3..f0e756be690433fcf944def5f64229fd20e75748 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 b5dd194afa840a8dfa59270dc50c1db0eee0a9e2..ccf24ad69e698692adb1f873fa673cd204a7b6fe 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 4849636261a29a950cfe1f65820ab2bce95f0922..57cac681050dbb58f484665598a3791402122dad 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 fd306ef3914d94985cea135f41eeed9ad2d5014c..e12616c961824a301b1af41fe3dbf471ec6ba956 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 c355c6de27af7a8277f30fe17982fed29043b5d1..02f3063dda850439667db3d3ee6a07c28d7be1e9 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 0e0995b243953f733235a2741ff86b952b33e82a..6ea6b7059ce6f8d02a9b784008d62a95731d4e2f 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 83f31a21083b763e8971ea217f4c06772c3c75cd..3b453d17bc4f39e447f89c96913113c721558905 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 345698c2efdd0f7c1bd39c8f71dcd8417ea5a2a2..790d70a094bdf1a4de495c033be74595d004de61 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 d956d8d23a90fa23a5cbad5e91234388b39d7dc2..de28747699d8840f565a4408119912eee256510f 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 5c1598253924c2e6f32af2520a6b30ca19b89d33..f0fd6607f0701b96db86c9be546b1f1cb823114b 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 00e9589b00da9d53a36db6f7d926623f4acf6f25..6d0075be6c8732003d5184a3993e5df6e3183dd0 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 e6d4edec0a6d97fc50177b101776b3dd6a745926..3014346fa88dc43513de02189977734f0fc0fcd2 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 d470760f018aaaedc550c17ed9c7e64637dc329d..6fa0acf3a648c993cc37968a0925723c3406d460 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 b50e0b2e3c58a5fa7e4d70ec2a84354a8db7326e..a8025b6cb70da8555be363e1ac5ef1a59026ff85 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 39fa467adeba6274a234db88c2ed1761602ad76d..ebb34a4abaf993a285dc769286c65b7f9db34367 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 f4248ba8cde7f3f4846934c46d5152099d1428ce..a08058027ebdc12cff398ed5b394e83bc9791fb0 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 aeaff9c170cf40efd06f6007fccbf9de8a81bf57..2067eb2d4600f322d0bce17c8676ce28733ede39 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 a1060d8a6f20d7a7925a0a7c70c63d9e4718e05e..270b9ac93a0ccf3bc6f4586f262595b80880f9ff 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 45fc9828aa80a0b3049795109080649fb46ae04e..8eb4a75aa3736a6a1c1c3ed99035c8ace4ed5441 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 856dc775600412378a64bb9ef2749bb417b45fe2..3e0511a1860ec3f6d451cf77f5e7655c10d6fd75 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 88b0a922e2d4b075966d95b45b4d1b9d968056f3..471c405c488739b2ea9b8bed187d30e82391a532 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 ff5cab9ef5b6b8b426e07c4922613fbcc872a1a4..8524f90298135d054c687cc304afb06753a32624 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 3af36a1ed09e465095af4304009c5bd4eecdd744..977b02264d6e0f1988660ce5423fd4f96b9ffaf8 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 3fc488d03383712c62196c9342270d81c97ca16c..e2a91365ae14fe297d8c12b6a2b54a31b07566c7 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 fe4b2bf32cf9b7e7490ca402f592714da7b880df..48cda2a8fbf79ffff6fde64dc11a85029db46d18 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 c6540878a4bbc9a91ed4c938a4bd0bf16c25cdd6..11872f4956b1bf735f272764f90a9c4bf52b2f8b 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 8d086045c4a9f4ffa662b9ed437b228e2c25fb9c..e81e9048a76c696da9a358140882987a246a76eb 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 88cb2c7a08f4f10e818afc8b940909c42be196a4..14216c31d50518bcb63cd014e1406b0257c35527 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 0ef293df07c56f8f0654aff42aa69481f5333326..dc073f400e54197b4644303edcd593ddca912869 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 4c07b02c6718c2f662f7e82681b276d0491a4883..05926a00f7016ce60d930cfc065969673c500fda 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 e238c97b70f1623e56d8017a310e3477487a7bb0..98407a0e203a26f5b3650c7f16429b97af3f4dfa 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 27a6acd188aa7563f467edda45d7e247fa18cf12..9d802dd4c13e7dc4e6c47054f367119fe8edd1c1 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 1be123dc7cb8818724f0d6d24501cdab4de01cd4..6e7df34151ca1fa86ec73bc191ffab1332456376 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 e95f59cf4b47c3789207ccf04683ef89e3a4ff3f..fe016ad6fbe0f457e2f40c5f049a797d1b5e0a24 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 7241b494a85ddfab5cca2eb3347865fc723c6a8b..e90ce9235112e14d0517a5508215f5dae8c2c4c6 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 23f473e8fed8832f89ad6b90dc308ced7ba9703f..6d66c72675bb2bd84baebd370e98e511f3312eba 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 08ec64190b75e8327f53a86f3663ea8d6a655ce1..c61896eea8d8488eb0d5dbc1053df55238292c2d 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 01f9914cc141eb3c49fd73506e9b1c5470edd781..abfa40820dc99bf2c64c7bf0a31994eedc414e03 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 eec268a656a32e7138817824f555074ccc214a96..3609bd8f17bb6f3267fa72750280e82c61ef5d04 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 6d294ffd6df1a26a469dbb4e72533b01503468dd..139597f9cb07c5d48bed18984ec4747f4b4f3438 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 5a90b3eea15655cec2432af72d4320cd534e1487..a526bfbba70e5fddf38b9364bee30b9dcdaca93c 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 795dd0becf2e7bfa64fe35dc4604cf9ef3d930e5..16618da56b28107dec0102b31bf5a5b3eb75fd09 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 f179a455e791a7a98561f9f96752ea309dbd991c..c65a6a20313002902b4660493d05be5c4cd20a24 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 faa5ea12cb985b96b3cf8dfb7aaba6136b39e01e..50e343424b8498d32078648978c719c923304353 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 53a35e5d60f0fbe6fd7735e0c766bee233f84b47..e507c21c7a37ddc69ab55e2e3c467600aa6233f2 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 6f204182e8853fcdf0c362dc2042395eb5f42e57..849e7f8668ca60a2dac8c71e440b3447dba9b726 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 e030457706da6ba06557f906f43b86f309a151e8..916b2861a11a9f0e3fd55fa6f236e2cc9d448fb4 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 10986442c8af0d2cd5ace5f2f10999932b822f92..c3f70049a8f7cfc869839bed8563fe1e82304f7d 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 47a9538c9c70be0cb96fee4119eb024db27b79cc..b2521d6744ed6263cf6f60c92ec42936dded73f7 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 bb8a0c78f31d163b182bce9d037991bb99b9f6ef..099bd1f8ac4b7a81e94ef6f777a8bd8f6109221e 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 475e67aa3e5f4d1159aa3b7acfb20bda93f059b1..d036df693ea41dfaa3debffffad0462c1fcd8e4a 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 46593ae68fcfbe9d6480dd172e0897af49742cdc..71d49c28b2f01a003dc9bdda6cd25a43f8bc2899 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 c60023025e6a3f29890e846c535d7a242816ab7e..b5d7f6f8e415d419bd42e9a819f7c73952adc860 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 23007798721d0fe9fce79a3e10900002a78ce5a6..325b219770cb2e32fdaff49e727994030b09b5d8 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 47e4a30f26c711f19f407f5b8dc5d4fe7bb2a66f..b9e4ff408db15c09cd03ecf79f6a76e8b03a67a2 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 f8e524db70285676d4c45d1db6298187c375d420..deaf22ecf4b0582fa2ae0e8139f9d581c5c2b963 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 4bf9315514313624382fa63da3b41b9e8290c7c4..32a1219f8ac147ba8f4c8501d11a6eb8debd9124 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 227ba1077096ad9251e7b08939612d762611b14f..1b57bf4d57b05f9341e1b65c78a1adbc776e3222 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 0031775f7be35105665993a2d525454c9d43dc86..47458b7bbdf994962f8c666b802e57a440ce8f37 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 f86b208627fc9dfce59c1e3184b8571350113cc0..ca4a094e20c698002c86403d02fe7f7a42f337d5 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 77919000e05633287a6cf37c1d812e598b4090af..3546df8df11b34d800c60a77027a211d4a1e2bb6 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 184a7c0d6493cd38d83d653e85651df21df8f402..0f2e09b2e0bab651339f2cd65f494f889375bced 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 4d8885b5f87a503a9ef37c017830a6f2b2ec5079..c374ddeb15a33b92ff8c90e3f0127b1ccc5b7b8d 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 ccec0b37c0900d5176750d37d423a7b50dbc9d08..511afb65c55e3578646cb99d2cd2a1cc29a952ed 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 8bace2b9fde752c103469c590b5829d8510a3acc..9420cc5b79b8d444095b0f61c03bce8cff7d2c38 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 b7b42ecb60b806f338b718efed0bef662f774825..82696e45abb6eb48a4294cb3aae537561027c1e5 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 16fd95e10b60acab70876dcd66e4ea6ceccf675c..eb9d1e25fb1ad0aae8e7b3d20b62633b6b77e2d7 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 27a57776ed52092d0cec0e199045a0b945d1e1c0..50003d8edc6738e6cc4f2869ed5ee81bb135dd02 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 8de2911cb07d41a93c2af025e19a9050934ffb4c..777afe0d157acb199a51f88eb6e4c214e06af679 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 a28fb4add0e28adfa4155fbe2749b6f8fc215439..962b251cb3f11966fca13593ed83108837b6c405 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 183bb32533db25ef131c86ee2b827233453142c2..b5d0a01d55a408f7c0d03c0c63f7d9c35e1b7c83 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 d7b9c67e1429656929672e2da221222d77d95655..d59b5a482b015d29981607583c6dd281adc22ba9 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 10e85193d594bb1ba15389855230dbcc93e290fd..e678a36274780d48ed837600b989c242a24ed646 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 c319a38a44ed09c7124257a56ab3a8e18091b3d5..1d5bfae95a2a73e568e4eeb368352c08c3eeed13 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 538c655f0a9a3c70d87e32dacae8a4f2e3879b95..90e4e803465c61955773367a6849cfff1cc73ea4 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 060c45aaaeb56b506e8196df8139213d50d76b31..7556c8e730f0eace96c78c784bb89ff36f9012c4 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 72ae4c48a1c4ee10371350c3eaea984d4c61feea..557c4bdefee53cd918a12740970fffc2f7b89542 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 1482ee7d7f07ad258b9a104ece1e851528925cbf..b72b264f4c1411234828bd2a2af341459d59609a 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 d3c5dca11850558162e0feafd352cc70eeb0bfd5..aa37efef619673b5e4713f602e7b9b157f1d6f76 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 edb68b3d163935168c908865a8d56aa3025ae9df..0fbd10e62626ed8f593c420322c65483c246f5ff 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 74e3c913a7db6246bc765f147ca872996112c6bb..d21c4f633653a0eae75d04b2f6eff684ff9d200d 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 97d93c99e6708909597500e9c1306fac28d60671..eb174c2e03165b57e11c915d4113efbd75835ba3 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 9653f405eb80c7ce18475c0d604f967eff1c3c57..fc9b23b7d53422ce54abd698b7c191c2396b4fd2 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 e7a65ec22d813f5530e4af8e6bac5da96e81f372..3f9ae5c189c93467365eee63d6b393973c31d5ee 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 f9574a678498483f4e138d4890fc1fa079cebce4..d9f4ad1c1342cf15c3742577c234da6f40b6db77 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 f645a564ca88eb238ced5784cdc5ff2450910075..03d276b78dc4744a35b60022e7c931a6a6d264dc 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 9e6354675ae348efbd5b9f47c940f6145f371103..d8a49c01a48b05255347f767ace16732ef3dd053 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 bb2853ef6638b8d2294edbd8d7d1c2c225c8a061..57b9b72e1563dddfa31c34dbc2a8f3a5adce00ab 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 a07c5ef6868a9498540285027bdb2239d08ab92c..5e15d4da427205f030af88890c6198e17ffcfc47 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 53d4b0507b62499e100407043f44a952994442c8..5e9c9a450b8b5a574030eb2de3ef41e626e68923 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 97ab831fc7a69163163f7182f1f8c61bd9e3ffc4..2ac31772c592bd967935a873ae08d3ba2c0791fc 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 a82998fb7166e9847f81afea9d9377a4f046ab37..ff3a5618349f3cb20a1172403b41aeb9e6a90797 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 10850ab3b837ec11b4d230b6268fde03ee1a19a8..7fa99ec61b208eecff55a08f530b3954b536ed8f 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 fdf448e5be3b675d585bccf141b8e2a6ffe67754..e1db51bd979abfdc185e9abb492cde05ddac410f 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():