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

Merge branch 'REL18-CAPIF_API_Provider_Management' into 'OCF64-rel17-to-rel18' 

REL18 api provider management

See merge request !50
parents 85cdf6df 0a0b8ffe

services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/FILES

+8 −4
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_provider_management/__init__.py

api_provider_management/__init__.py

api_provider_management/__main__.py

api_provider_management/__main__.py

api_provider_management/controllers/__init__.py

api_provider_management/controllers/__init__.py

api_provider_management/controllers/default_controller.py

api_provider_management/controllers/default_controller.py

api_provider_management/controllers/security_controller_.py

api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py

api_provider_management/controllers/security_controller.py

api_provider_management/encoder.py

api_provider_management/encoder.py

api_provider_management/models/__init__.py

api_provider_management/models/__init__.py

api_provider_management/models/api_provider_enrolment_details.py

api_provider_management/models/api_provider_enrolment_details.py

api_provider_management/models/api_provider_enrolment_details_patch.py

api_provider_management/models/api_provider_func_role.py

api_provider_management/models/api_provider_func_role.py

api_provider_management/models/api_provider_func_role_any_of.py

api_provider_management/models/api_provider_function_details.py

api_provider_management/models/api_provider_function_details.py

api_provider_management/models/base_model_.py

api_provider_management/models/base_model.py

api_provider_management/models/invalid_param.py

api_provider_management/models/invalid_param.py

api_provider_management/models/problem_details.py

api_provider_management/models/problem_details.py

api_provider_management/models/registration_information.py

api_provider_management/models/registration_information.py

api_provider_management/openapi/openapi.yaml

api_provider_management/openapi/openapi.yaml

api_provider_management/test/__init__.py

api_provider_management/test/__init__.py

api_provider_management/test/test_default_controller.py

api_provider_management/test/test_individual_api_provider_enrolment_details_controller.py

api_provider_management/typing_utils.py

api_provider_management/typing_utils.py

api_provider_management/util.py

api_provider_management/util.py

git_push.sh

requirements.txt

requirements.txt

setup.py

setup.py

test-requirements.txt

test-requirements.txt

services/TS29222_CAPIF_API_Provider_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_Provider_Management_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 api_provider_management

python3 -m openapi_server

```

```





and open your browser to here:

and open your browser to here:

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py

+8 −11
Original line number Original line Diff line number Diff line
@@ -2,9 +2,10 @@ import connexion 
from flask import Response, request, current_app

from flask import Response, request, current_app





from ..core.provider_enrolment_details_api import ProviderManagementOperations

from ..core.provider_enrolment_details_api import ProviderManagementOperations

from ..models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501

from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501

from ..models.problem_details import ProblemDetails  # noqa: E501

from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501

from .. import util

from api_provider_management import util



from ..core.validate_user import ControlAccess

from ..core.validate_user import ControlAccess





from cryptography import x509

from cryptography import x509
@@ -14,9 +15,6 @@ from cryptography import x509 
from functools import wraps

from functools import wraps









import sys





provider_management_ops = ProviderManagementOperations()

provider_management_ops = ProviderManagementOperations()

valid_user = ControlAccess()

valid_user = ControlAccess()
@@ -54,9 +52,8 @@ def registrations_post(body): # noqa: E501 
    :param api_provider_enrolment_details: 

    :param api_provider_enrolment_details: 

    :type api_provider_enrolment_details: dict | bytes

    :type api_provider_enrolment_details: dict | bytes





    :rtype: APIProviderEnrolmentDetails

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

    """

    """



    identity = get_jwt_identity()

    identity = get_jwt_identity()

    username, uuid = identity.split()

    username, uuid = identity.split()
@@ -79,7 +76,7 @@ def registrations_registration_id_delete(registration_id): # noqa: E501 
    :param registration_id: String identifying an registered API provider domain resource.

    :param registration_id: String identifying an registered API provider domain resource.

    :type registration_id: str

    :type registration_id: str





    :rtype: None

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

    """

    """

    current_app.logger.info("Removing Provider Domain")

    current_app.logger.info("Removing Provider Domain")

    res = provider_management_ops.delete_api_provider_enrolment_details(registration_id)

    res = provider_management_ops.delete_api_provider_enrolment_details(registration_id)
@@ -98,7 +95,7 @@ def registrations_registration_id_put(registration_id, body): # noqa: E501 
    :param api_provider_enrolment_details: Representation of the API provider domain registration details to be updated in CAPIF core function. 

    :param api_provider_enrolment_details: Representation of the API provider domain registration details to be updated in CAPIF core function. 

    :type api_provider_enrolment_details: dict | bytes

    :type api_provider_enrolment_details: dict | bytes





    :rtype: APIProviderEnrolmentDetails

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

    """

    """

    current_app.logger.info("Updating Provider Domain")

    current_app.logger.info("Updating Provider Domain")

    if connexion.request.is_json:

    if connexion.request.is_json:

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py

+5 −7
Original line number Original line Diff line number Diff line
@@ -2,17 +2,16 @@ import connexion 
from flask import Response, request, current_app

from flask import Response, request, current_app

from ..core.provider_enrolment_details_api import ProviderManagementOperations

from ..core.provider_enrolment_details_api import ProviderManagementOperations

from ..encoder import JSONEncoder

from ..encoder import JSONEncoder

from ..models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501

from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501

from ..models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch  # noqa: E501

from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch  # noqa: E501

from ..models.problem_details import ProblemDetails  # noqa: E501

from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501

from .. import util

from api_provider_management import util





from cryptography.hazmat.backends import default_backend

from cryptography.hazmat.backends import default_backend

from cryptography import x509

from cryptography import x509





provider_management_ops = ProviderManagementOperations()

provider_management_ops = ProviderManagementOperations()







def modify_ind_api_provider_enrolment(registration_id, body):  # noqa: E501

def modify_ind_api_provider_enrolment(registration_id, body):  # noqa: E501

    """modify_ind_api_provider_enrolment

    """modify_ind_api_provider_enrolment
@@ -23,9 +22,8 @@ def modify_ind_api_provider_enrolment(registration_id, body): # noqa: E501 
    :param api_provider_enrolment_details_patch: 

    :param api_provider_enrolment_details_patch: 

    :type api_provider_enrolment_details_patch: dict | bytes

    :type api_provider_enrolment_details_patch: dict | bytes





    :rtype: APIProviderEnrolmentDetails

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

    """

    """



    current_app.logger.info("Patch Provider Domain")

    current_app.logger.info("Patch Provider Domain")

    if connexion.request.is_json:

    if connexion.request.is_json:

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

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