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

Merge branch 'REL-18-Access-Control-Policy' into 'OCF64-rel17-to-rel18'

REL18 ACL service

See merge request !54
parents 3ab07205 83231d30
Loading
Loading
Loading
Loading
Loading
+19 −18
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
git_push.sh
openapi_server/__init__.py
capif_acl/__init__.py
openapi_server/__main__.py
capif_acl/__main__.py
openapi_server/controllers/__init__.py
capif_acl/controllers/__init__.py
openapi_server/controllers/default_controller.py
capif_acl/controllers/default_controller.py
openapi_server/controllers/security_controller_.py
capif_acl/controllers/security_controller.py
openapi_server/encoder.py
capif_acl/encoder.py
openapi_server/models/__init__.py
capif_acl/models/__init__.py
openapi_server/models/access_control_policy_list.py
capif_acl/models/access_control_policy_list.py
openapi_server/models/api_invoker_policy.py
capif_acl/models/api_invoker_policy.py
openapi_server/models/base_model_.py
capif_acl/models/base_model.py
openapi_server/models/invalid_param.py
capif_acl/models/invalid_param.py
openapi_server/models/problem_details.py
capif_acl/models/problem_details.py
openapi_server/models/time_range_list.py
capif_acl/models/time_range_list.py
openapi_server/openapi/openapi.yaml
capif_acl/openapi/openapi.yaml
openapi_server/test/__init__.py
capif_acl/test/__init__.py
openapi_server/test/test_default_controller.py
capif_acl/test/test_default_controller.py
openapi_server/typing_utils.py
capif_acl/typing_utils.py
openapi_server/util.py
capif_acl/util.py
requirements.txt
requirements.txt
setup.py
setup.py
test-requirements.txt
test-requirements.txt
+1 −1
Original line number Original line Diff line number Diff line
6.5.0
7.5.0
 No newline at end of file
+2 −2
Original line number Original line Diff line number Diff line
@@ -42,8 +42,8 @@ To run the server on a Docker container, please execute the following from the r


```bash
```bash
# building the image
# building the image
docker build -t openapi_server .
docker build -t capif_acl .


# starting up a container
# starting up a container
docker run -p 8080:8080 openapi_server
docker run -p 8080:8080 capif_acl
```
```
 No newline at end of file
+8 −2
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 capif_acl.models.access_control_policy_list import AccessControlPolicyList  # noqa: E501
from capif_acl.models.problem_details import ProblemDetails  # noqa: E501
from capif_acl import util


from functools import wraps
from functools import wraps
from flask import request, current_app
from flask import request, current_app
@@ -6,7 +14,6 @@ from cryptography.hazmat.backends import default_backend


from ..core.accesscontrolpolicyapi import accessControlPolicyApi
from ..core.accesscontrolpolicyapi import accessControlPolicyApi



def cert_validation():
def cert_validation():
    def _cert_validation(f):
    def _cert_validation(f):
        @wraps(f)
        @wraps(f)
@@ -24,7 +31,6 @@ def cert_validation():
        return __cert_validation
        return __cert_validation
    return _cert_validation
    return _cert_validation



@cert_validation()
@cert_validation()
def access_control_policy_list_service_api_id_get(service_api_id, aef_id, api_invoker_id=None, supported_features=None):  # noqa: E501
def access_control_policy_list_service_api_id_get(service_api_id, aef_id, api_invoker_id=None, supported_features=None):  # noqa: E501
    """access_control_policy_list_service_api_id_get
    """access_control_policy_list_service_api_id_get
+0 −0

File moved.

Loading