REL18 events service

Pelayo Torresrequested to merge
REL18-Events-Service into OCF64-rel17-to-rel18

Merge request reports

services/TS29222_CAPIF_Events_API/.openapi-generator/FILES

+33 −13
Changes for services/TS29222_CAPIF_Events_API/.openapi-generator/FILES: 33 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -3,64 +3,84 @@ 
.travis.yml

Dockerfile

README.md

git_push.sh

capif_events/__init__.py

capif_events/__main__.py

capif_events/controllers/__init__.py

capif_events/controllers/default_controller.py

capif_events/controllers/security_controller_.py

capif_events/controllers/security_controller.py

capif_events/encoder.py

capif_events/models/__init__.py

capif_events/models/access_control_policy_list.py

capif_events/models/access_control_policy_list_ext.py

capif_events/models/access_control_policy_list_ext_all_of.py

capif_events/models/aef_location.py

capif_events/models/aef_profile.py

capif_events/models/api_invoker_policy.py

capif_events/models/base_model_.py

capif_events/models/api_status.py

capif_events/models/base_model.py

capif_events/models/buffered_notifications_action.py

capif_events/models/capif_event.py

capif_events/models/capif_event_any_of.py

capif_events/models/capif_event_detail.py

capif_events/models/capif_event_filter.py

capif_events/models/civic_address.py

capif_events/models/communication_type.py

capif_events/models/communication_type_any_of.py

capif_events/models/custom_operation.py

capif_events/models/data_format.py

capif_events/models/data_format_any_of.py

capif_events/models/ellipsoid_arc.py

capif_events/models/event_notification.py

capif_events/models/event_subscription.py

capif_events/models/event_subscription_patch.py

capif_events/models/gad_shape.py

capif_events/models/geographic_area.py

capif_events/models/geographical_coordinates.py

capif_events/models/interface_description.py

capif_events/models/invalid_param.py

capif_events/models/invocation_log.py

capif_events/models/ip_addr_range.py

capif_events/models/ipv4_address_range.py

capif_events/models/ipv4_address_range1.py

capif_events/models/ipv6_addr1.py

capif_events/models/ipv6_address_range.py

capif_events/models/ipv6_address_range1.py

capif_events/models/local2d_point_uncertainty_ellipse.py

capif_events/models/local3d_point_uncertainty_ellipsoid.py

capif_events/models/local_origin.py

capif_events/models/log.py

capif_events/models/muting_exception_instructions.py

capif_events/models/muting_notifications_settings.py

capif_events/models/notification_flag.py

capif_events/models/notification_flag_any_of.py

capif_events/models/notification_method.py

capif_events/models/notification_method_any_of.py

capif_events/models/operation.py

capif_events/models/operation_any_of.py

capif_events/models/partitioning_criteria.py

capif_events/models/partitioning_criteria_any_of.py

capif_events/models/point.py

capif_events/models/point_altitude.py

capif_events/models/point_altitude_uncertainty.py

capif_events/models/point_uncertainty_circle.py

capif_events/models/point_uncertainty_ellipse.py

capif_events/models/polygon.py

capif_events/models/problem_details.py

capif_events/models/protocol.py

capif_events/models/protocol_any_of.py

capif_events/models/published_api_path.py

capif_events/models/relative_cartesian_location.py

capif_events/models/reporting_information.py

capif_events/models/resource.py

capif_events/models/routing_rule.py

capif_events/models/security_method.py

capif_events/models/security_method_any_of.py

capif_events/models/service_api_description.py

capif_events/models/service_kpis.py

capif_events/models/shareable_information.py

capif_events/models/subscription_action.py

capif_events/models/supported_gad_shapes.py

capif_events/models/time_range_list.py

capif_events/models/topology_hiding.py

capif_events/models/uncertainty_ellipse.py

capif_events/models/uncertainty_ellipsoid.py

capif_events/models/version.py

capif_events/models/websock_notif_config.py

capif_events/openapi/openapi.yaml

capif_events/test/__init__.py

capif_events/typing_utils.py

capif_events/util.py

git_push.sh

requirements.txt

setup.py

test-requirements.txt

services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION

+1 −1
Changes for services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
5.3.0-SNAPSHOT
 
 No newline at end of file
 
7.5.0

services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py

+48 −4
Changes for services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py: 48 added lines, 4 removed lines.
Original line number Diff line number Diff line 
import connexion

from typing import Dict

from typing import Tuple

from typing import Union



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
@@ -50,9 +58,8 @@ def subscriber_id_subscriptions_post(subscriber_id, body): # noqa: E501 
    :param event_subscription: 

    :type event_subscription: dict | bytes



    :rtype: EventSubscription

    :rtype: Union[EventSubscription, Tuple[EventSubscription, int], Tuple[EventSubscription, int, Dict[str, str]]

    """



    current_app.logger.info("Creating event subscription")

    if connexion.request.is_json:

        body = EventSubscription.from_dict(connexion.request.get_json())  # noqa: E501
@@ -72,11 +79,48 @@ def subscriber_id_subscriptions_subscription_id_delete(subscriber_id, subscripti 
    :param subscription_id: Identifier of an individual Events Subscription

    :type subscription_id: str



    :rtype: None

    :rtype: Union[None, Tuple[None, int], Tuple[None, int, Dict[str, str]]

    """



    current_app.logger.info("Removing event subscription")



    res = events_ops.delete_event(subscriber_id, subscription_id)



    return res





def subscriber_id_subscriptions_subscription_id_patch(subscriber_id, subscription_id, event_subscription_patch):  # noqa: E501

    """subscriber_id_subscriptions_subscription_id_patch



    Modification of an existing individual CAPIF Event Subscription. # noqa: E501



    :param subscriber_id: Identifier of the Subscriber

    :type subscriber_id: str

    :param subscription_id: Identifier of the individual Subscriber

    :type subscription_id: str

    :param event_subscription_patch: 

    :type event_subscription_patch: dict | bytes



    :rtype: Union[EventSubscription, Tuple[EventSubscription, int], Tuple[EventSubscription, int, Dict[str, str]]

    """

    if connexion.request.is_json:

        event_subscription_patch = EventSubscriptionPatch.from_dict(connexion.request.get_json())  # noqa: E501

    return 'do some magic!'





def subscriber_id_subscriptions_subscription_id_put(subscriber_id, subscription_id, event_subscription):  # noqa: E501

    """subscriber_id_subscriptions_subscription_id_put



    Update of an existing individual CAPIF Event Subscription. # noqa: E501



    :param subscriber_id: Identifier of the Subscriber

    :type subscriber_id: str

    :param subscription_id: Identifier of the individual Subscriber

    :type subscription_id: str

    :param event_subscription: 

    :type event_subscription: dict | bytes



    :rtype: Union[EventSubscription, Tuple[EventSubscription, int], Tuple[EventSubscription, int, Dict[str, str]]

    """

    if connexion.request.is_json:

        event_subscription = EventSubscription.from_dict(connexion.request.get_json())  # noqa: E501

    return 'do some magic!'

services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller_.py→services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller.py

+0 −0

File moved.

View file

services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py

+30 −13
Changes for services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py: 30 added lines, 13 removed lines.
Original line number Diff line number Diff line 
# coding: utf-8



# flake8: noqa

from __future__ import absolute_import

# 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.access_control_policy_list_ext_all_of import AccessControlPolicyListExtAllOf

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_any_of import CAPIFEventAnyOf

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.communication_type_any_of import CommunicationTypeAnyOf

from capif_events.models.custom_operation import CustomOperation

from capif_events.models.data_format import DataFormat

from capif_events.models.data_format_any_of import DataFormatAnyOf

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_flag_any_of import NotificationFlagAnyOf

from capif_events.models.notification_method import NotificationMethod

from capif_events.models.notification_method_any_of import NotificationMethodAnyOf

from capif_events.models.operation import Operation

from capif_events.models.operation_any_of import OperationAnyOf

from capif_events.models.partitioning_criteria import PartitioningCriteria

from capif_events.models.partitioning_criteria_any_of import PartitioningCriteriaAnyOf

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.protocol_any_of import ProtocolAnyOf

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.security_method_any_of import SecurityMethodAnyOf

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