Commit acdd4f84 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'OCF64-rel17-to-rel18' into 'staging' 

Ocf64 rel17 to rel18

See merge request !66
parents 2e60f82c 1634f430

services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/FILES

+34 −8
Original line number Original line Diff line number Diff line 
.dockerignore

.dockerignore

.gitignore

.gitignore

.openapi-generator-ignore

.travis.yml

.travis.yml

Dockerfile

Dockerfile

README.md

README.md

git_push.sh

api_invoker_management/__init__.py

api_invoker_management/__init__.py

api_invoker_management/__main__.py

api_invoker_management/__main__.py

api_invoker_management/controllers/__init__.py

api_invoker_management/controllers/__init__.py

api_invoker_management/controllers/default_controller.py

api_invoker_management/controllers/default_controller.py

api_invoker_management/controllers/security_controller_.py

api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py

api_invoker_management/controllers/security_controller.py

api_invoker_management/encoder.py

api_invoker_management/encoder.py

api_invoker_management/models/__init__.py

api_invoker_management/models/__init__.py

api_invoker_management/models/aef_location.py

api_invoker_management/models/aef_profile.py

api_invoker_management/models/aef_profile.py

api_invoker_management/models/api_invoker_enrolment_details.py

api_invoker_management/models/api_invoker_enrolment_details.py

api_invoker_management/models/base_model_.py

api_invoker_management/models/api_invoker_enrolment_details_patch.py

api_invoker_management/models/api_list.py

api_invoker_management/models/api_status.py

api_invoker_management/models/base_model.py

api_invoker_management/models/civic_address.py

api_invoker_management/models/communication_type.py

api_invoker_management/models/communication_type.py

api_invoker_management/models/communication_type_any_of.py

api_invoker_management/models/custom_operation.py

api_invoker_management/models/custom_operation.py

api_invoker_management/models/data_format.py

api_invoker_management/models/data_format.py

api_invoker_management/models/data_format_any_of.py

api_invoker_management/models/ellipsoid_arc.py

api_invoker_management/models/gad_shape.py

api_invoker_management/models/geographic_area.py

api_invoker_management/models/geographical_coordinates.py

api_invoker_management/models/interface_description.py

api_invoker_management/models/interface_description.py

api_invoker_management/models/invalid_param.py

api_invoker_management/models/invalid_param.py

api_invoker_management/models/ip_addr_range.py

api_invoker_management/models/ipv4_address_range.py

api_invoker_management/models/ipv6_addr1.py

api_invoker_management/models/ipv6_address_range.py

api_invoker_management/models/local2d_point_uncertainty_ellipse.py

api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py

api_invoker_management/models/local_origin.py

api_invoker_management/models/onboarding_information.py

api_invoker_management/models/onboarding_information.py

api_invoker_management/models/onboarding_notification.py

api_invoker_management/models/onboarding_notification.py

api_invoker_management/models/operation.py

api_invoker_management/models/operation.py

api_invoker_management/models/operation_any_of.py

api_invoker_management/models/point.py

api_invoker_management/models/point_altitude.py

api_invoker_management/models/point_altitude_uncertainty.py

api_invoker_management/models/point_uncertainty_circle.py

api_invoker_management/models/point_uncertainty_ellipse.py

api_invoker_management/models/polygon.py

api_invoker_management/models/problem_details.py

api_invoker_management/models/problem_details.py

api_invoker_management/models/protocol.py

api_invoker_management/models/protocol.py

api_invoker_management/models/protocol_any_of.py

api_invoker_management/models/published_api_path.py

api_invoker_management/models/published_api_path.py

api_invoker_management/models/relative_cartesian_location.py

api_invoker_management/models/resource.py

api_invoker_management/models/resource.py

api_invoker_management/models/security_method.py

api_invoker_management/models/security_method.py

api_invoker_management/models/security_method_any_of.py

api_invoker_management/models/service_api_description.py

api_invoker_management/models/service_api_description.py

api_invoker_management/models/service_kpis.py

api_invoker_management/models/shareable_information.py

api_invoker_management/models/shareable_information.py

api_invoker_management/models/supported_gad_shapes.py

api_invoker_management/models/uncertainty_ellipse.py

api_invoker_management/models/uncertainty_ellipsoid.py

api_invoker_management/models/version.py

api_invoker_management/models/version.py

api_invoker_management/models/websock_notif_config.py

api_invoker_management/models/websock_notif_config.py

api_invoker_management/openapi/openapi.yaml

api_invoker_management/openapi/openapi.yaml

api_invoker_management/test/__init__.py

api_invoker_management/test/__init__.py

api_invoker_management/test/test_default_controller.py

api_invoker_management/test/test_individual_api_invoker_enrolment_details_controller.py

api_invoker_management/typing_utils.py

api_invoker_management/typing_utils.py

api_invoker_management/util.py

api_invoker_management/util.py

git_push.sh

requirements.txt

requirements.txt

setup.py

setup.py

test-requirements.txt

test-requirements.txt

services/TS29222_CAPIF_API_Invoker_Management_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_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
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

    """modify_ind_api_invoke_enrolment



    Modify an individual API invoker details. # noqa: E501



    :param onboarding_id: 

    :type onboarding_id: str

    :param api_invoker_enrolment_details_patch: 

    :type api_invoker_enrolment_details_patch: dict | bytes



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

    """

    if request.is_json:

        api_invoker_enrolment_details_patch = APIInvokerEnrolmentDetailsPatch.from_dict(request.get_json())  # noqa: E501

    return 'do some magic!'

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller_.py→services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller.py

+0 −0

File moved.

View file

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py

+2 −2
Original line number Original line Diff line number Diff line 
from connexion.jsonifier import JSONEncoder

from connexion.jsonifier import JSONEncoder

import six

import six





from models.base_model_ import Model

from api_invoker_management.models.base_model import Model









class CustomJSONEncoder(JSONEncoder):

class CustomJSONEncoder(JSONEncoder):
@@ -10,7 +10,7 @@ class CustomJSONEncoder(JSONEncoder): 
    def default(self, o):

    def default(self, o):

        if isinstance(o, Model):

        if isinstance(o, Model):

            dikt = {}

            dikt = {}

            for attr, _ in six.iteritems(o.openapi_types):

            for attr in o.openapi_types:

                value = getattr(o, attr)

                value = getattr(o, attr)

                if value is None and not self.include_nulls:

                if value is None and not self.include_nulls:

                    continue

                    continue