Merge branch 'REL18-Security_Service' into 'OCF64-rel17-to-rel18' (53fa952b) · Commits · OCF / capif

services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,9 +3,9 @@ from typing import Dict
		from typing import Tuple
		from typing import Union

		from openapi_server.models.problem_details import ProblemDetails # noqa: E501
		from openapi_server.models.routing_info import RoutingInfo # noqa: E501
		from openapi_server import util
		from capif_routing_info.models.problem_details import ProblemDetails # noqa: E501
		from capif_routing_info.models.routing_info import RoutingInfo # noqa: E501
		from capif_routing_info import util


		def service_apis_service_api_id_get(service_api_id, aef_id, supp_feat=None): # noqa: E501

services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py

+1 −1

Original line number	Diff line number	Diff line
		from connexion.apps.flask_app import FlaskJSONEncoder

		from openapi_server.models.base_model import Model
		from capif_routing_info.models.base_model import Model


		class JSONEncoder(FlaskJSONEncoder):

services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/init.py

+40 −40

Original line number	Diff line number	Diff line
		# flake8: noqa
		# import models into model package
		from openapi_server.models.aef_location import AefLocation
		from openapi_server.models.aef_profile import AefProfile
		from openapi_server.models.civic_address import CivicAddress
		from openapi_server.models.communication_type import CommunicationType
		from openapi_server.models.custom_operation import CustomOperation
		from openapi_server.models.data_format import DataFormat
		from openapi_server.models.ellipsoid_arc import EllipsoidArc
		from openapi_server.models.gad_shape import GADShape
		from openapi_server.models.geographic_area import GeographicArea
		from openapi_server.models.geographical_coordinates import GeographicalCoordinates
		from openapi_server.models.interface_description import InterfaceDescription
		from openapi_server.models.invalid_param import InvalidParam
		from openapi_server.models.ip_addr_range import IpAddrRange
		from openapi_server.models.ipv4_address_range import Ipv4AddressRange
		from openapi_server.models.ipv4_address_range1 import Ipv4AddressRange1
		from openapi_server.models.ipv6_addr1 import Ipv6Addr1
		from openapi_server.models.ipv6_address_range import Ipv6AddressRange
		from openapi_server.models.ipv6_address_range1 import Ipv6AddressRange1
		from openapi_server.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse
		from openapi_server.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid
		from openapi_server.models.local_origin import LocalOrigin
		from openapi_server.models.operation import Operation
		from openapi_server.models.point import Point
		from openapi_server.models.point_altitude import PointAltitude
		from openapi_server.models.point_altitude_uncertainty import PointAltitudeUncertainty
		from openapi_server.models.point_uncertainty_circle import PointUncertaintyCircle
		from openapi_server.models.point_uncertainty_ellipse import PointUncertaintyEllipse
		from openapi_server.models.polygon import Polygon
		from openapi_server.models.problem_details import ProblemDetails
		from openapi_server.models.protocol import Protocol
		from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation
		from openapi_server.models.resource import Resource
		from openapi_server.models.routing_info import RoutingInfo
		from openapi_server.models.routing_rule import RoutingRule
		from openapi_server.models.security_method import SecurityMethod
		from openapi_server.models.service_kpis import ServiceKpis
		from openapi_server.models.supported_gad_shapes import SupportedGADShapes
		from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse
		from openapi_server.models.uncertainty_ellipsoid import UncertaintyEllipsoid
		from openapi_server.models.version import Version
		from capif_routing_info.models.aef_location import AefLocation
		from capif_routing_info.models.aef_profile import AefProfile
		from capif_routing_info.models.civic_address import CivicAddress
		from capif_routing_info.models.communication_type import CommunicationType
		from capif_routing_info.models.custom_operation import CustomOperation
		from capif_routing_info.models.data_format import DataFormat
		from capif_routing_info.models.ellipsoid_arc import EllipsoidArc
		from capif_routing_info.models.gad_shape import GADShape
		from capif_routing_info.models.geographic_area import GeographicArea
		from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
		from capif_routing_info.models.interface_description import InterfaceDescription
		from capif_routing_info.models.invalid_param import InvalidParam
		from capif_routing_info.models.ip_addr_range import IpAddrRange
		from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange
		from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1
		from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1
		from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange
		from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1
		from capif_routing_info.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse
		from capif_routing_info.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid
		from capif_routing_info.models.local_origin import LocalOrigin
		from capif_routing_info.models.operation import Operation
		from capif_routing_info.models.point import Point
		from capif_routing_info.models.point_altitude import PointAltitude
		from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty
		from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle
		from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse
		from capif_routing_info.models.polygon import Polygon
		from capif_routing_info.models.problem_details import ProblemDetails
		from capif_routing_info.models.protocol import Protocol
		from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation
		from capif_routing_info.models.resource import Resource
		from capif_routing_info.models.routing_info import RoutingInfo
		from capif_routing_info.models.routing_rule import RoutingRule
		from capif_routing_info.models.security_method import SecurityMethod
		from capif_routing_info.models.service_kpis import ServiceKpis
		from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
		from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse
		from capif_routing_info.models.uncertainty_ellipsoid import UncertaintyEllipsoid
		from capif_routing_info.models.version import Version

services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,13 +2,13 @@ from datetime import date, datetime # noqa: F401

		from typing import List, Dict # noqa: F401

		from openapi_server.models.base_model import Model
		from openapi_server.models.civic_address import CivicAddress
		from openapi_server.models.geographic_area import GeographicArea
		from openapi_server import util
		from capif_routing_info.models.base_model import Model
		from capif_routing_info.models.civic_address import CivicAddress
		from capif_routing_info.models.geographic_area import GeographicArea
		from capif_routing_info import util

		from openapi_server.models.civic_address import CivicAddress # noqa: E501
		from openapi_server.models.geographic_area import GeographicArea # noqa: E501
		from capif_routing_info.models.civic_address import CivicAddress # noqa: E501
		from capif_routing_info.models.geographic_area import GeographicArea # noqa: E501

		class AefLocation(Model):
		"""NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py

+19 −19

Original line number	Diff line number	Diff line
		@@ -2,25 +2,25 @@ from datetime import date, datetime # noqa: F401

		from typing import List, Dict # noqa: F401

		from openapi_server.models.base_model import Model
		from openapi_server.models.aef_location import AefLocation
		from openapi_server.models.data_format import DataFormat
		from openapi_server.models.interface_description import InterfaceDescription
		from openapi_server.models.ip_addr_range import IpAddrRange
		from openapi_server.models.protocol import Protocol
		from openapi_server.models.security_method import SecurityMethod
		from openapi_server.models.service_kpis import ServiceKpis
		from openapi_server.models.version import Version
		from openapi_server import util

		from openapi_server.models.aef_location import AefLocation # noqa: E501
		from openapi_server.models.data_format import DataFormat # noqa: E501
		from openapi_server.models.interface_description import InterfaceDescription # noqa: E501
		from openapi_server.models.ip_addr_range import IpAddrRange # noqa: E501
		from openapi_server.models.protocol import Protocol # noqa: E501
		from openapi_server.models.security_method import SecurityMethod # noqa: E501
		from openapi_server.models.service_kpis import ServiceKpis # noqa: E501
		from openapi_server.models.version import Version # noqa: E501
		from capif_routing_info.models.base_model import Model
		from capif_routing_info.models.aef_location import AefLocation
		from capif_routing_info.models.data_format import DataFormat
		from capif_routing_info.models.interface_description import InterfaceDescription
		from capif_routing_info.models.ip_addr_range import IpAddrRange
		from capif_routing_info.models.protocol import Protocol
		from capif_routing_info.models.security_method import SecurityMethod
		from capif_routing_info.models.service_kpis import ServiceKpis
		from capif_routing_info.models.version import Version
		from capif_routing_info import util

		from capif_routing_info.models.aef_location import AefLocation # noqa: E501
		from capif_routing_info.models.data_format import DataFormat # noqa: E501
		from capif_routing_info.models.interface_description import InterfaceDescription # noqa: E501
		from capif_routing_info.models.ip_addr_range import IpAddrRange # noqa: E501
		from capif_routing_info.models.protocol import Protocol # noqa: E501
		from capif_routing_info.models.security_method import SecurityMethod # noqa: E501
		from capif_routing_info.models.service_kpis import ServiceKpis # noqa: E501
		from capif_routing_info.models.version import Version # noqa: E501

		class AefProfile(Model):
		"""NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).