Release 1.3.0

docker-compose-test.yml

@@ -138,3 +138,19 @@ services:
     networks:
       - other_net_registry
       - apps
+
+  extra_bad_beacon:
+    hostname: extra_bad_beacon
+    image: cscfi/beacon-python
+    environment:
+      HOST: "0.0.0.0"
+      PORT: 5053
+      DATABASE_URL: other_db_registry
+      DATABASE_USER: user
+      DATABASE_PASSWORD: pass
+      DATABASE_NAME: registry
+    ports:
+      - 5053:5053
+    networks:
+      - other_net_registry
+      - apps

registry/endpoints/services.py

@@ -105,7 +105,7 @@ async def update_service(request, db_pool):
             if new_id_found_service and service_id != new_service_id:
                 response["message"] = "Service update failed, see error.."
                 response["error"] = "Another service has already been registered with the new service id."
-                raise web.HTTPConflict(body=json.dumps(response), content_type="application/json")
+                raise web.HTTPConflict(text=json.dumps(response), content_type="application/json")
             # Request service info from given url
             service_info = await http_request_info(url)
             # Parse and validate service info object

setup.py

@@ -2,15 +2,15 @@
 
 setup(
     name="beacon_network",
-    version="0.2.dev",
+    version="1.2.0",
     description="Beacon Network services",
     long_description_content_type="text/markdown",
     project_urls={
         "Source": "https://github.com/CSCfi/beacon-network",
     },
     author="CSC - IT Center for Science",
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 3 - Beta",
         "Intended Audience :: Developers",
         "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
         "License :: OSI Approved :: Apache Software License",

tests/integration/run_tests.py

@@ -2,26 +2,94 @@
 import asyncio
 import httpx
 import logging
+import re
+import json
 
 FORMAT = "[%(asctime)s][%(name)s][%(process)d %(processName)s][%(levelname)-8s](L:%(lineno)s) %(funcName)s: %(message)s"
 logging.basicConfig(format=FORMAT, datefmt="%Y-%m-%d %H:%M:%S")
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.DEBUG)
 
-SESSION = httpx.AsyncClient()
-
 AGGREGATOR = "http://localhost:5050"
 REGISTRY = "http://localhost:8080"
+REGISTRY_KEY = "07b4e8ed58a6f97897b03843474c8cc981d154ffe45b10ef88a9f127b15c5c56"
 
 
 async def test_service_info(endpoint, name, artifact):
     """Test service info endpoint."""
     LOG.debug(f"Checking service info endpoint for: {artifact}")
-    response = await SESSION.get(f"{endpoint}/service-info")
-    assert response.status_code == 200, "HTTP status code error service info"
-    data = response.json()
-    assert data["name"] == name, "Wrong endpoint service name"
-    assert data["type"]["artifact"] == artifact, "Wrong service artifact"
+    async with httpx.AsyncClient() as client:
+        response = await client.get(f"{endpoint}/service-info")
+        assert response.status_code == 200, "HTTP status code error service info"
+        data = response.json()
+        assert data["name"] == name, "Wrong endpoint service name"
+        assert data["type"]["artifact"] == artifact, "Wrong service artifact"
+
+
+async def test_get_services(endpoint, expected_nb, expected_beacon):
+    """Test GET services registry."""
+    LOG.debug("Checking registry listing services")
+    async with httpx.AsyncClient() as client:
+        response = await client.get(f"{endpoint}/services")
+        assert response.status_code == 200, "HTTP status code error service info"
+        data = response.json()
+        assert len(data) == expected_nb, "We did not find the expected number of services"
+        assert re.search(f'"id": "{expected_beacon}"', json.dumps(data), re.M), "We did not find the expected beacon"
+
+    LOG.debug("Checking registry listing services types")
+    async with httpx.AsyncClient() as client:
+        server_types = await client.get(f"{endpoint}/services/types")
+        data = server_types.json()
+        assert data == ["service-registry", "beacon-aggregator", "beacon"], "We did not find the expected services types"
+
+
+async def test_service_operations(endpoint):
+    """Test Registry services operations."""
+    extra_beacon = {"type": "beacon", "url": "http://extra_bad_beacon:5053/service-info"}
+    update_beacon = {"type": "beacon", "url": "http://bad_beacon:5052/service-info"}
+
+    LOG.debug("Add new service to the registry")
+    async with httpx.AsyncClient() as client:
+        response = await client.post(f"{endpoint}/services", data=json.dumps(extra_beacon), headers={"Authorization": REGISTRY_KEY})
+        assert response.status_code == 201, "HTTP status code error service add"
+        data = response.json()
+        assert data["serviceId"] == "extra_bad_beacon:5053", "Wrong beacon id obtained"
+
+    LOG.debug("Update service from the registry with existing one")
+    async with httpx.AsyncClient() as client:
+        conflict_response = await client.put(
+            f"{endpoint}/services/{data['serviceId']}", data=json.dumps(update_beacon), headers={"Beacon-Service-Key": data["serviceKey"]}
+        )
+
+        conflict_data = conflict_response.json()
+        assert conflict_response.status_code == 409, "HTTP status code error service update"
+        assert conflict_data["error"] == "Another service has already been registered with the new service id.", "Conflict error mismatched"
+
+    LOG.debug("Update service from the registry correctly")
+    async with httpx.AsyncClient() as client:
+        update_response = await client.put(
+            f"{endpoint}/services/{data['serviceId']}", data=json.dumps(extra_beacon), headers={"Beacon-Service-Key": data["serviceKey"]}
+        )
+
+        updated_data = update_response.json()
+        assert update_response.status_code == 200, "HTTP status code error service update"
+
+    LOG.debug("Remove service from the registry")
+    async with httpx.AsyncClient() as client:
+        await client.delete(f"{endpoint}/services/{updated_data['newServiceId']}", headers={"Beacon-Service-Key": data["serviceKey"]})
+        assert update_response.status_code == 200, "HTTP status code error service delete"
+
+
+async def test_query_aggregator(endpoint, expected_nb, expected_beacon):
+    """Test Aggregatpr query operation."""
+    LOG.debug("make a query over the aggregator")
+    params = {"includeDatasetResponses": "HIT", "assemblyId": "GRCh38", "referenceName": "MT", "start": "9", "referenceBases": "T", "alternateBases": "C"}
+    async with httpx.AsyncClient() as client:
+        response = await client.get(f"{endpoint}/query", params=params)
+        data = response.json()
+        assert response.status_code == 200, "HTTP status code error aggregator query"
+        assert len(data) == expected_nb, "We did not find the expected number of responses"
+        assert re.search(f'"service": "{expected_beacon}"', json.dumps(data), re.M), "We did not find the expected beacon"
 
 
 async def main():
@@ -31,7 +99,13 @@ async def main():
     await test_service_info(AGGREGATOR, "ELIXIR-FI Beacon Aggregator", "beacon-aggregator")
     await test_service_info(REGISTRY, "ELIXIR-FI Beacon Registry", "service-registry")
 
-    await SESSION.aclose()
+    LOG.debug("=== Test Registry Endpoint ===")
+
+    await test_get_services(REGISTRY, 4, "bad_beacon:5052")
+    await test_service_operations(REGISTRY)
+
+    LOG.debug("=== Test Aggregator Endpoint ===")
+    await test_query_aggregator(AGGREGATOR, 6, "http://bad_beacon:5052/query")
 
 
 if __name__ == "__main__":