From 35c7702a3e06ac5919230c6cae8a4394daa04cb0 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 13:01:50 +0100 Subject: [PATCH 1/5] 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 8325d80d39dd92c9ce7d5d8a629dd247ffc91acf Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 14:25:26 +0100 Subject: [PATCH 2/5] 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 6f435df7e941a0c6123735ca5cc474b4de506075 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 14:27:59 +0100 Subject: [PATCH 3/5] added c2 and more services +4 --- pkgs/clan-cli/tests/test_db_api.py | 32 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index f1da20e..5f6d16e 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -84,6 +84,7 @@ 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", @@ -95,9 +96,10 @@ def test_producer2(api: TestClient) -> None: "entity_did": default_entity_did2, } paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did2) + 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", @@ -109,7 +111,7 @@ def test_producer3(api: TestClient) -> None: "entity_did": default_entity_did3, } paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did3) + get_request = "entity_did=" + url.quote(default_entity_did3) make_test_post_and_get(api, request_body, paramter, get_request) @@ -124,7 +126,7 @@ def test_producer4(api: TestClient) -> None: "entity_did": default_entity_did4, } paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did4) + get_request = "entity_did=" + url.quote(default_entity_did4) make_test_post_and_get(api, request_body, paramter, get_request) @@ -139,11 +141,10 @@ def test_producer5(api: TestClient) -> None: "entity_did": default_entity_did5, } paramter = "producer" - get_request = "entity_did="+url.quote(default_entity_did5) + get_request = "entity_did=" + url.quote(default_entity_did5) make_test_post_and_get(api, request_body, paramter, get_request) - ######################### # # # Consumer # @@ -159,6 +160,7 @@ 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, @@ -166,9 +168,10 @@ def test_consumer2(api: TestClient) -> None: "other": {"war": "games"}, } paramter = "consumer" - get_request = "entity_did="+url.quote(default_entity_did2) + get_request = "entity_did=" + url.quote(default_entity_did2) make_test_post_and_get(api, request_body, paramter, get_request) + ######################### # # # REPOSITORY # @@ -187,6 +190,8 @@ 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", @@ -198,9 +203,10 @@ def test_repository2(api: TestClient) -> None: "entity_did": default_entity_did2, } paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did2) + 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", @@ -212,7 +218,7 @@ def test_repository3(api: TestClient) -> None: "entity_did": default_entity_did3, } paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did3) + get_request = "entity_did=" + url.quote(default_entity_did3) make_test_post_and_get(api, request_body, paramter, get_request) @@ -227,7 +233,7 @@ def test_repository4(api: TestClient) -> None: "entity_did": default_entity_did4, } paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did4) + get_request = "entity_did=" + url.quote(default_entity_did4) make_test_post_and_get(api, request_body, paramter, get_request) @@ -242,11 +248,10 @@ def test_repository5(api: TestClient) -> None: "entity_did": default_entity_did5, } paramter = "repository" - get_request = "entity_did="+url.quote(default_entity_did5) + get_request = "entity_did=" + url.quote(default_entity_did5) make_test_post_and_get(api, request_body, paramter, get_request) - ######################### # # # Entity # @@ -264,6 +269,7 @@ def test_entity(api: TestClient) -> None: # 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, @@ -273,5 +279,5 @@ def test_entity2(api: TestClient) -> None: "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 + get_request = "entity_did=" + url.quote(default_entity_did2) + make_test_post_and_get(api, request_body, paramter, get_request) -- 2.51.0 From 0a902a843d8b90937f90019ece7b2d5dd177f6e8 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sat, 2 Dec 2023 14:55:12 +0100 Subject: [PATCH 4/5] add commit push fail --- pkgs/clan-cli/tests/test_db_api.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index 5f6d16e..6663ec5 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -191,7 +191,6 @@ def test_repository(api: TestClient) -> None: # 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", @@ -206,7 +205,6 @@ def test_repository2(api: TestClient) -> None: 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", @@ -221,7 +219,6 @@ def test_repository3(api: TestClient) -> None: 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", @@ -236,7 +233,6 @@ def test_repository4(api: TestClient) -> None: 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", -- 2.51.0 From ef74a557e853087c5add1f6c881fd08b42fce9e7 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sun, 3 Dec 2023 14:17:20 +0100 Subject: [PATCH 5/5] add formatting --- pkgs/clan-cli/tests/test_db_api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/clan-cli/tests/test_db_api.py b/pkgs/clan-cli/tests/test_db_api.py index 6663ec5..5f6d16e 100644 --- a/pkgs/clan-cli/tests/test_db_api.py +++ b/pkgs/clan-cli/tests/test_db_api.py @@ -191,6 +191,7 @@ def test_repository(api: TestClient) -> None: # 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", @@ -205,6 +206,7 @@ def test_repository2(api: TestClient) -> None: 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", @@ -219,6 +221,7 @@ def test_repository3(api: TestClient) -> None: 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", @@ -233,6 +236,7 @@ def test_repository4(api: TestClient) -> None: 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", -- 2.51.0