diff options
| author |   Thomas Duval <thomas.duval@orange.com> | 2018-01-04 16:52:34 +0100 |
|---|---|---|
| committer | Thomas Duval <thomas.duval@orange.com> | 2018-01-04 16:52:34 +0100 |
| commit | 3a3072d2e1c4a17375405a6e7e8fd9adeab0c434 (patch) | |
| tree | 82f408efbe26df1a03b669810e0977cd622cac10 /moon_interface/tests | |
| parent | 64232ea214cb6fdccee5c53a360231c2f2802b27 (diff) | |
wrapper: send pdp_id to interface instead of keystone_project_id
Change-Id: I847cad7d096ae8af23334eb049d583d4ed06d8d4
Diffstat (limited to 'moon_interface/tests')
| -rw-r--r-- | moon_interface/tests/unit_python/api/test_authz.py | 2 | ||||
| -rw-r--r-- | moon_interface/tests/unit_python/conftest.py | 31 |
2 files changed, 16 insertions, 17 deletions
diff --git a/moon_interface/tests/unit_python/api/test_authz.py b/moon_interface/tests/unit_python/api/test_authz.py index 84605203..10957218 100644 --- a/moon_interface/tests/unit_python/api/test_authz.py +++ b/moon_interface/tests/unit_python/api/test_authz.py @@ -10,7 +10,7 @@ def test_authz_true(context): server = moon_interface.server.create_server() client = server.app.test_client() req = client.get("/authz/{p_id}/{s_id}/{o_id}/{a_id}".format( - p_id=context["project_id"], + p_id=context["pdp_id"], s_id=context["subject_name"], o_id=context["object_name"], a_id=context["action_name"], diff --git a/moon_interface/tests/unit_python/conftest.py b/moon_interface/tests/unit_python/conftest.py index 35ee19d7..a6acbcdd 100644 --- a/moon_interface/tests/unit_python/conftest.py +++ b/moon_interface/tests/unit_python/conftest.py @@ -39,21 +39,19 @@ CONF = { "container": "wukongsun/moon_orchestrator:v4.3", "hostname": "orchestrator" }, - "interface": { - "bind": "0.0.0.0", - "port": 8080, - "container": "wukongsun/moon_interface:v4.3", - "hostname": "interface" - } - }, - "plugins": { - "session": { - "port": 8082, - "container": "asteroide/session:latest" - }, - "authz": { - "port": 8081, - "container": "wukongsun/moon_authz:v4.3" + "pipeline": { + "interface": { + "bind": "0.0.0.0", + "port": 8080, + "container": "wukongsun/moon_interface:v4.3", + "hostname": "interface" + }, + "authz": { + "bind": "0.0.0.0", + "port": 8081, + "container": "wukongsun/moon_authz:v4.3", + "hostname": "authz" + }, } }, "logging": { @@ -128,10 +126,11 @@ COMPONENTS = ( "slave", "components/manager", "components/orchestrator", - "components/interface", + "components/pipeline", ) CONTEXT = { + "pdp_id": "b3d3e18abf3340e8b635fd49e6634ccd", "project_id": "a64beb1cc224474fb4badd43173e7101", "subject_name": "testuser", "object_name": "vm1", |