From 095ca3d2e388f7df2b4f1f7bf34bddda1d9f0bd5 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 13:01:50 +0100 Subject: [PATCH 1/3] try to fix tea --- pkgs/tea-create-pr/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tea-create-pr/script.sh b/pkgs/tea-create-pr/script.sh index a22ae5d..ef3f0a3 100644 --- a/pkgs/tea-create-pr/script.sh +++ b/pkgs/tea-create-pr/script.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -euo pipefail +set -xeuo pipefail remoteName="${1:-origin}" targetBranch="${2:-main}" -- 2.51.0 From 09d0c28fd676dd8bb9ce583fc690d405aef9b788 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 14:25:26 +0100 Subject: [PATCH 2/3] added c2 and more services +4 --- pkgs/clan-cli/tests/test_db_api.py | 143 +++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index 99aa7cd..f1da20e 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -1,9 +1,14 @@ +import urllib.parse as url from typing import Any from api import TestClient default_entity_did_url = "entity_did=did%3Asov%3Atest%3A1234" default_entity_did = "did:sov:test:1234" +default_entity_did2 = "did:sov:test:1235" +default_entity_did3 = "did:sov:test:1236" +default_entity_did4 = "did:sov:test:1237" +default_entity_did5 = "did:sov:test:1238" def assert_extra_info( @@ -79,6 +84,65 @@ def test_producer(api: TestClient) -> None: # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) +def test_producer2(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d1", + "service_name": "Luis'''s Fax", + "service_type": "Fax", + "endpoint_url": "http://127.0.0.1:8001", + "status": "unknown", + "other": {"faxen": "dicke"}, + "entity_did": default_entity_did2, + } + paramter = "producer" + get_request = "entity_did="+url.quote(default_entity_did2) + make_test_post_and_get(api, request_body, paramter, get_request) + +def test_producer3(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d2", + "service_name": "Erdem'''s VR-Stream", + "service_type": "VR-Stream", + "endpoint_url": "http://127.0.0.1:8002", + "status": "unknown", + "other": {"oculos": "rift"}, + "entity_did": default_entity_did3, + } + paramter = "producer" + get_request = "entity_did="+url.quote(default_entity_did3) + make_test_post_and_get(api, request_body, paramter, get_request) + + +def test_producer4(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d3", + "service_name": "Onur'''s gallary", + "service_type": "gallary", + "endpoint_url": "http://127.0.0.1:8003", + "status": "unknown", + "other": {"nice": "pics"}, + "entity_did": default_entity_did4, + } + paramter = "producer" + get_request = "entity_did="+url.quote(default_entity_did4) + make_test_post_and_get(api, request_body, paramter, get_request) + + +def test_producer5(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", + "service_name": "Sara'''s Game-Shop", + "service_type": "Game-Shop", + "endpoint_url": "http://127.0.0.1:8004", + "status": "unknown", + "other": {"war": "games"}, + "entity_did": default_entity_did5, + } + paramter = "producer" + get_request = "entity_did="+url.quote(default_entity_did5) + make_test_post_and_get(api, request_body, paramter, get_request) + + ######################### # # @@ -95,6 +159,15 @@ def test_consumer(api: TestClient) -> None: # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) +def test_consumer2(api: TestClient) -> None: + request_body = { + "entity_did": default_entity_did2, + "producer_uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", + "other": {"war": "games"}, + } + paramter = "consumer" + get_request = "entity_did="+url.quote(default_entity_did2) + make_test_post_and_get(api, request_body, paramter, get_request) ######################### # # @@ -114,6 +187,64 @@ def test_repository(api: TestClient) -> None: paramter = "repository" # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) +def test_repository2(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d1", + "service_name": "Luis'''s Fax", + "service_type": "Fax", + "endpoint_url": "http://127.0.0.1:8001", + "status": "unknown", + "other": {"faxen": "dicke"}, + "entity_did": default_entity_did2, + } + paramter = "repository" + get_request = "entity_did="+url.quote(default_entity_did2) + make_test_post_and_get(api, request_body, paramter, get_request) + +def test_repository3(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d2", + "service_name": "Erdem'''s VR-Stream", + "service_type": "VR-Stream", + "endpoint_url": "http://127.0.0.1:8002", + "status": "unknown", + "other": {"oculos": "rift"}, + "entity_did": default_entity_did3, + } + paramter = "repository" + get_request = "entity_did="+url.quote(default_entity_did3) + make_test_post_and_get(api, request_body, paramter, get_request) + + +def test_repository4(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d3", + "service_name": "Onur'''s gallary", + "service_type": "gallary", + "endpoint_url": "http://127.0.0.1:8003", + "status": "unknown", + "other": {"nice": "pics"}, + "entity_did": default_entity_did4, + } + paramter = "repository" + get_request = "entity_did="+url.quote(default_entity_did4) + make_test_post_and_get(api, request_body, paramter, get_request) + + +def test_repository5(api: TestClient) -> None: + request_body = { + "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", + "service_name": "Sara'''s Game-Shop", + "service_type": "Game-Shop", + "endpoint_url": "http://127.0.0.2:8004", + "status": "unknown", + "other": {"war": "games"}, + "entity_did": default_entity_did5, + } + paramter = "repository" + get_request = "entity_did="+url.quote(default_entity_did5) + make_test_post_and_get(api, request_body, paramter, get_request) + ######################### @@ -132,3 +263,15 @@ def test_entity(api: TestClient) -> None: paramter = "entity" # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) + +def test_entity2(api: TestClient) -> None: + request_body = { + "did": default_entity_did2, + "name": "C2", + "ip": "127.0.0.2", + "attached": False, + "other": {"test": "test"}, + } + paramter = "entity" + get_request = "entity_did="+url.quote(default_entity_did2) + make_test_post_and_get(api, request_body, paramter, get_request) \ No newline at end of file -- 2.51.0 From 3a05626ec3e913752729e6363b998edae6982d83 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Mon, 4 Dec 2023 22:38:21 +0100 Subject: [PATCH 3/3] some fail in test deleted and added de/attach as post :) --- .../clan_cli/webui/routers/sql_connect.py | 4 +- pkgs/clan-cli/tests/test_db_api.py | 126 ------------------ 2 files changed, 2 insertions(+), 128 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py b/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py index 5a9f338..9a5c8b1 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/sql_connect.py @@ -178,7 +178,7 @@ def get_attached_entities( return entities -@router.get("/api/v1/detach") +@router.post("/api/v1/detach") async def detach( background_tasks: BackgroundTasks, entity_did: str = "did:sov:test:1234", @@ -192,7 +192,7 @@ async def detach( return {"message": "Detaching in the background"} -@router.get("/api/v1/attach") +@router.post("/api/v1/attach") async def attach( background_tasks: BackgroundTasks, entity_did: str = "did:sov:test:1234", diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index 01151da..5f6d16e 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -84,65 +84,6 @@ def test_producer(api: TestClient) -> None: # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) -def test_producer2(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d1", - "service_name": "Luis'''s Fax", - "service_type": "Fax", - "endpoint_url": "http://127.0.0.1:8001", - "status": "unknown", - "other": {"faxen": "dicke"}, - "entity_did": default_entity_did2, - } - paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did2) - make_test_post_and_get(api, request_body, paramter, get_request) - -def test_producer3(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d2", - "service_name": "Erdem'''s VR-Stream", - "service_type": "VR-Stream", - "endpoint_url": "http://127.0.0.1:8002", - "status": "unknown", - "other": {"oculos": "rift"}, - "entity_did": default_entity_did3, - } - paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did3) - make_test_post_and_get(api, request_body, paramter, get_request) - - -def test_producer4(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d3", - "service_name": "Onur'''s gallary", - "service_type": "gallary", - "endpoint_url": "http://127.0.0.1:8003", - "status": "unknown", - "other": {"nice": "pics"}, - "entity_did": default_entity_did4, - } - paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did4) - make_test_post_and_get(api, request_body, paramter, get_request) - - -def test_producer5(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", - "service_name": "Sara'''s Game-Shop", - "service_type": "Game-Shop", - "endpoint_url": "http://127.0.0.1:8004", - "status": "unknown", - "other": {"war": "games"}, - "entity_did": default_entity_did5, - } - paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did5) - make_test_post_and_get(api, request_body, paramter, get_request) - - def test_producer2(api: TestClient) -> None: request_body = { @@ -219,15 +160,6 @@ def test_consumer(api: TestClient) -> None: # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) -def test_consumer2(api: TestClient) -> None: - request_body = { - "entity_did": default_entity_did2, - "producer_uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", - "other": {"war": "games"}, - } - paramter = "consumer" - get_request = "entity_did="+url.quote(default_entity_did2) - make_test_post_and_get(api, request_body, paramter, get_request) def test_consumer2(api: TestClient) -> None: request_body = { @@ -258,64 +190,6 @@ def test_repository(api: TestClient) -> None: paramter = "repository" # get_request = "entity_did=did%3Asov%3Atest%3A1234" make_test_post_and_get(api, request_body, paramter) -def test_repository2(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d1", - "service_name": "Luis'''s Fax", - "service_type": "Fax", - "endpoint_url": "http://127.0.0.1:8001", - "status": "unknown", - "other": {"faxen": "dicke"}, - "entity_did": default_entity_did2, - } - paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did2) - make_test_post_and_get(api, request_body, paramter, get_request) - -def test_repository3(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d2", - "service_name": "Erdem'''s VR-Stream", - "service_type": "VR-Stream", - "endpoint_url": "http://127.0.0.1:8002", - "status": "unknown", - "other": {"oculos": "rift"}, - "entity_did": default_entity_did3, - } - paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did3) - make_test_post_and_get(api, request_body, paramter, get_request) - - -def test_repository4(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d3", - "service_name": "Onur'''s gallary", - "service_type": "gallary", - "endpoint_url": "http://127.0.0.1:8003", - "status": "unknown", - "other": {"nice": "pics"}, - "entity_did": default_entity_did4, - } - paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did4) - make_test_post_and_get(api, request_body, paramter, get_request) - - -def test_repository5(api: TestClient) -> None: - request_body = { - "uuid": "8e285c0c-4e40-430a-a477-26b3b81e30d4", - "service_name": "Sara'''s Game-Shop", - "service_type": "Game-Shop", - "endpoint_url": "http://127.0.0.2:8004", - "status": "unknown", - "other": {"war": "games"}, - "entity_did": default_entity_did5, - } - paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did5) - make_test_post_and_get(api, request_body, paramter, get_request) - def test_repository2(api: TestClient) -> None: -- 2.51.0