From 90c6df93f4b6d752d7de8e97b7ca34b60ae17451 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Fri, 26 Jan 2024 08:38:45 +0100 Subject: [PATCH 1/3] change deamon0 8000 to deamon1 8001 as emulation --- pkgs/clan-cli/clan_cli/emulate_fastapi.py | 60 +++++++++++------------ pkgs/clan-cli/tests/test_db_api.py | 1 + 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/emulate_fastapi.py b/pkgs/clan-cli/clan_cli/emulate_fastapi.py index 0e0bed8..2339ed9 100644 --- a/pkgs/clan-cli/clan_cli/emulate_fastapi.py +++ b/pkgs/clan-cli/clan_cli/emulate_fastapi.py @@ -138,32 +138,9 @@ async def ap_list_of_services() -> JSONResponse: "uuid": "bdd640fb-0667-1ad1-1c80-317fa3b1799d", "service_name": "Carlos Printing0", "service_type": "3D Printing", - "endpoint_url": "http://127.0.0.1:8000/v1/print_daemon0", - "other": {}, - "entity_did": "did:sov:test:120", - "status": {"data": ["draft", "registered"]}, - "action": { - "data": [ - { - "name": "register", - "endpoint": "http://127.0.0.1:8000/v1/print_daemon0/register", - }, - { - "name": "deregister", - "endpoint": "http://127.0.0.1:8000/v1/print_daemon0/deregister", - }, - ] - }, - "usage": [{"times_consumed": 2, "consumer_entity_did": "did:sov:test:120"}], - }, - # Service 2 (similar structure) - { - "uuid": "23b8c1e9-3924-56de-3eb1-3b9046685257", - "service_name": "Carlos Printing1", - "service_type": "3D Printing", "endpoint_url": "http://127.0.0.1:8001/v1/print_daemon1", "other": {}, - "entity_did": "did:sov:test:121", + "entity_did": "did:sov:test:120", "status": {"data": ["draft", "registered"]}, "action": { "data": [ @@ -179,13 +156,14 @@ async def ap_list_of_services() -> JSONResponse: }, "usage": [{"times_consumed": 2, "consumer_entity_did": "did:sov:test:120"}], }, + # Service 2 (similar structure) { - "uuid": "bd9c66b3-ad3c-2d6d-1a3d-1fa7bc8960a9", - "service_name": "Carlos Printing2", + "uuid": "23b8c1e9-3924-56de-3eb1-3b9046685257", + "service_name": "Carlos Printing1", "service_type": "3D Printing", "endpoint_url": "http://127.0.0.1:8002/v1/print_daemon2", "other": {}, - "entity_did": "did:sov:test:122", + "entity_did": "did:sov:test:121", "status": {"data": ["draft", "registered"]}, "action": { "data": [ @@ -202,12 +180,12 @@ async def ap_list_of_services() -> JSONResponse: "usage": [{"times_consumed": 2, "consumer_entity_did": "did:sov:test:120"}], }, { - "uuid": "972a8469-1641-9f82-8b9d-2434e465e150", - "service_name": "Carlos Printing3", + "uuid": "bd9c66b3-ad3c-2d6d-1a3d-1fa7bc8960a9", + "service_name": "Carlos Printing2", "service_type": "3D Printing", "endpoint_url": "http://127.0.0.1:8003/v1/print_daemon3", "other": {}, - "entity_did": "did:sov:test:123", + "entity_did": "did:sov:test:122", "status": {"data": ["draft", "registered"]}, "action": { "data": [ @@ -223,6 +201,28 @@ async def ap_list_of_services() -> JSONResponse: }, "usage": [{"times_consumed": 2, "consumer_entity_did": "did:sov:test:120"}], }, + { + "uuid": "972a8469-1641-9f82-8b9d-2434e465e150", + "service_name": "Carlos Printing3", + "service_type": "3D Printing", + "endpoint_url": "http://127.0.0.1:8004/v1/print_daemon4", + "other": {}, + "entity_did": "did:sov:test:123", + "status": {"data": ["draft", "registered"]}, + "action": { + "data": [ + { + "name": "register", + "endpoint": "http://127.0.0.1:8004/v1/print_daemon4/register", + }, + { + "name": "deregister", + "endpoint": "http://127.0.0.1:8004/v1/print_daemon4/deregister", + }, + ] + }, + "usage": [{"times_consumed": 2, "consumer_entity_did": "did:sov:test:120"}], + }, ] return JSONResponse(content=res, status_code=200) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index eb50c9b..a2431ca 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -75,6 +75,7 @@ def create_entities(num: int = 5, role: str = "entity") -> list[EntityCreate]: def create_service(idx: int, entity: Entity) -> ServiceCreate: + idx += 1 se = ServiceCreate( uuid=uuids[idx], service_name=f"Carlos Printing{idx}", From 2e787aa38686efe8af41d8b853fd3abd5616f698 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Fri, 26 Jan 2024 08:43:43 +0100 Subject: [PATCH 2/3] change deamon0 8000 to deamon1 8001 as emulation --- pkgs/clan-cli/clan_cli/emulate_fastapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/emulate_fastapi.py b/pkgs/clan-cli/clan_cli/emulate_fastapi.py index 2339ed9..725c4ad 100644 --- a/pkgs/clan-cli/clan_cli/emulate_fastapi.py +++ b/pkgs/clan-cli/clan_cli/emulate_fastapi.py @@ -119,12 +119,12 @@ async def consume_service_from_other_entity_c2() -> HTMLResponse: return HTMLResponse(content=html_content, status_code=200) -@app_c2.get("/v1/print_daemon1/register", response_class=JSONResponse) +@app_c2.get("/v1/print_daemon2/register", response_class=JSONResponse) async def register_c2() -> JSONResponse: return JSONResponse(content={"status": "registered"}, status_code=200) -@app_c2.get("/v1/print_daemon1/deregister", response_class=JSONResponse) +@app_c2.get("/v1/print_daemon2/deregister", response_class=JSONResponse) async def deregister_c2() -> JSONResponse: return JSONResponse(content={"status": "deregistered"}, status_code=200) From eebc7eee20f8f93ce59fef98c3ddcbd8213f3011 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Fri, 26 Jan 2024 09:18:04 +0100 Subject: [PATCH 3/3] filter out ap dlg in entity view --- pkgs/clan-cli/tests/test_db_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index a2431ca..8c28a81 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -114,7 +114,7 @@ def test_create_entities(api_client: ApiClient) -> None: def test_create_services(api_client: ApiClient) -> None: sapi = ServicesApi(api_client=api_client) eapi = EntitiesApi(api_client=api_client) - for midx, entity in enumerate(eapi.get_all_entities()): + for midx, entity in enumerate(eapi.get_entity_by_roles([Role("service_prosumer")])): service_obj = create_service(midx, entity) service = sapi.create_service(service_obj) assert service.uuid == service_obj.uuid