Merge pull request 'georgs4' (#30) from georgs4 into main

Reviewed-on: #30

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(
@@ -80,6 +85,66 @@ def test_producer(api: TestClient) -> None:
     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)
+
+
 #########################
 #                       #
 #       Consumer        #
@@ -96,6 +161,17 @@ def test_consumer(api: TestClient) -> None:
     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)
+
+
 #########################
 #                       #
 #       REPOSITORY      #
@@ -116,6 +192,66 @@ def test_repository(api: TestClient) -> None:
     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)
+
+
 #########################
 #                       #
 #        Entity         #
@@ -132,3 +268,16 @@ 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)

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}"