Commit 3ab07205 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'REL18-Events-Service' into 'OCF64-rel17-to-rel18' 

REL18 events service

See merge request !53
parents a1b62a26 54f59a84

services/TS29222_CAPIF_Events_API/.openapi-generator/FILES

+33 −13
Original line number Original line Diff line number Diff line
@@ -3,64 +3,84 @@ 
.travis.yml

.travis.yml

Dockerfile

Dockerfile

README.md

README.md

git_push.sh

capif_events/__init__.py

capif_events/__init__.py

capif_events/__main__.py

capif_events/__main__.py

capif_events/controllers/__init__.py

capif_events/controllers/__init__.py

capif_events/controllers/default_controller.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/encoder.py

capif_events/models/__init__.py

capif_events/models/__init__.py

capif_events/models/access_control_policy_list.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.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/aef_profile.py

capif_events/models/api_invoker_policy.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.py

capif_events/models/capif_event_any_of.py

capif_events/models/capif_event_detail.py

capif_events/models/capif_event_detail.py

capif_events/models/capif_event_filter.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.py

capif_events/models/communication_type_any_of.py

capif_events/models/custom_operation.py

capif_events/models/custom_operation.py

capif_events/models/data_format.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_notification.py

capif_events/models/event_subscription.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/interface_description.py

capif_events/models/invalid_param.py

capif_events/models/invalid_param.py

capif_events/models/invocation_log.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_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_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/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.py

capif_events/models/notification_flag_any_of.py

capif_events/models/notification_method.py

capif_events/models/notification_method.py

capif_events/models/notification_method_any_of.py

capif_events/models/operation.py

capif_events/models/operation.py

capif_events/models/operation_any_of.py

capif_events/models/partitioning_criteria.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/problem_details.py

capif_events/models/protocol.py

capif_events/models/protocol.py

capif_events/models/protocol_any_of.py

capif_events/models/published_api_path.py

capif_events/models/published_api_path.py

capif_events/models/relative_cartesian_location.py

capif_events/models/reporting_information.py

capif_events/models/reporting_information.py

capif_events/models/resource.py

capif_events/models/resource.py

capif_events/models/routing_rule.py

capif_events/models/routing_rule.py

capif_events/models/security_method.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_api_description.py

capif_events/models/service_kpis.py

capif_events/models/shareable_information.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/time_range_list.py

capif_events/models/topology_hiding.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/version.py

capif_events/models/websock_notif_config.py

capif_events/models/websock_notif_config.py

capif_events/openapi/openapi.yaml

capif_events/openapi/openapi.yaml

capif_events/test/__init__.py

capif_events/test/__init__.py

capif_events/typing_utils.py

capif_events/typing_utils.py

capif_events/util.py

capif_events/util.py

git_push.sh

requirements.txt

requirements.txt

setup.py

setup.py

test-requirements.txt

test-requirements.txt

services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION

+1 −1
Original line number Original line Diff line number Diff line 
5.3.0-SNAPSHOT
 
7.5.0
 
 No newline at end of file

services/TS29222_CAPIF_Events_API/README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory: 




```

```

pip3 install -r requirements.txt

pip3 install -r requirements.txt

python3 -m capif_events

python3 -m openapi_server

```

```





and open your browser to here:

and open your browser to here:

services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py

+48 −4
Original line number Original line Diff line number Diff line 
import connexion

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 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

from ..core.events_apis import EventSubscriptionsOperations

import json

import json

from flask import Response, request, current_app

from flask import Response, request, current_app
@@ -50,9 +58,8 @@ def subscriber_id_subscriptions_post(subscriber_id, body): # noqa: E501 
    :param event_subscription: 

    :param event_subscription: 

    :type event_subscription: dict | bytes

    :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")

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

    if connexion.request.is_json:

    if connexion.request.is_json:

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

        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

    :param subscription_id: Identifier of an individual Events Subscription

    :type subscription_id: str

    :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")

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





    res = events_ops.delete_event(subscriber_id, subscription_id)

    res = events_ops.delete_event(subscriber_id, subscription_id)





    return res

    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!'